summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/devtools/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/devtools/protocol')
-rw-r--r--chromium/chrome/browser/devtools/protocol/DEPS1
-rw-r--r--chromium/chrome/browser/devtools/protocol/browser_handler.cc5
-rw-r--r--chromium/chrome/browser/devtools/protocol/security_handler.cc1
3 files changed, 2 insertions, 5 deletions
diff --git a/chromium/chrome/browser/devtools/protocol/DEPS b/chromium/chrome/browser/devtools/protocol/DEPS
index 76297a762e6..109e3a5657e 100644
--- a/chromium/chrome/browser/devtools/protocol/DEPS
+++ b/chromium/chrome/browser/devtools/protocol/DEPS
@@ -1,5 +1,4 @@
specific_include_rules = {
- # TODO(mash): Fix. https://crbug.com/758061
"window_manager_handler\.cc": [
"+ash/shell.h",
"+ash/wm/overview/overview_controller.h",
diff --git a/chromium/chrome/browser/devtools/protocol/browser_handler.cc b/chromium/chrome/browser/devtools/protocol/browser_handler.cc
index 3ba37138d18..1f8425dec8d 100644
--- a/chromium/chrome/browser/devtools/protocol/browser_handler.cc
+++ b/chromium/chrome/browser/devtools/protocol/browser_handler.cc
@@ -9,7 +9,6 @@
#include "base/bind.h"
#include "base/memory/ref_counted_memory.h"
-#include "base/task/post_task.h"
#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
#include "chrome/browser/devtools/devtools_dock_tile.h"
#include "chrome/browser/lifetime/application_lifetime.h"
@@ -112,8 +111,8 @@ Response BrowserHandler::GetWindowBounds(
}
Response BrowserHandler::Close() {
- base::PostTask(
- FROM_HERE, {content::BrowserThread::UI}, base::BindOnce([]() {
+ content::GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE, base::BindOnce([]() {
if (ChromeDevToolsManagerDelegate::GetInstance())
ChromeDevToolsManagerDelegate::GetInstance()->BrowserCloseRequested();
chrome::ExitIgnoreUnloadHandlers();
diff --git a/chromium/chrome/browser/devtools/protocol/security_handler.cc b/chromium/chrome/browser/devtools/protocol/security_handler.cc
index 03b2d85aa6c..c44998a5ca9 100644
--- a/chromium/chrome/browser/devtools/protocol/security_handler.cc
+++ b/chromium/chrome/browser/devtools/protocol/security_handler.cc
@@ -47,7 +47,6 @@ std::string SecurityLevelToProtocolSecurityState(
return protocol::Security::SecurityStateEnum::Insecure;
return protocol::Security::SecurityStateEnum::Neutral;
case security_state::SECURE_WITH_POLICY_INSTALLED_CERT:
- case security_state::EV_SECURE:
case security_state::SECURE:
return protocol::Security::SecurityStateEnum::Secure;
case security_state::DANGEROUS: