Fixed behavior in case of disabled devtools

chrome/browser/devtools/devtools_window.cc

Index: chrome/browser/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index a517f18ba8532dc828cdcae38af6451a50683541..d1e8b97643e98104e42c5d47ce4191794ad0f965 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -409,17 +409,23 @@ DevToolsWindow* DevToolsWindow::CreateDevToolsWindowForWorker(
 }
 
 // static
-DevToolsWindow* DevToolsWindow::OpenDevToolsWindow(
+void DevToolsWindow::OpenDevToolsWindow(
     content::WebContents* inspected_web_contents) {
-  return ToggleDevToolsWindow(
-      inspected_web_contents, true, DevToolsToggleAction::Show(), "");
+  DevToolsWindow::OpenDevToolsWindow(inspected_web_contents,
+                                     DevToolsToggleAction::Show());
 }
 
 // static
-DevToolsWindow* DevToolsWindow::OpenDevToolsWindow(
+void DevToolsWindow::OpenDevToolsWindow(
     content::WebContents* inspected_web_contents,
     const DevToolsToggleAction& action) {
-  return ToggleDevToolsWindow(inspected_web_contents, true, action, "");
+  Profile* profile =
+      Profile::FromBrowserContext(inspected_web_contents->GetBrowserContext());
+  // If development tools disabled by policy don't open the window.
+  if (profile->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled)) {
+    return;
+  }
+  ToggleDevToolsWindow(inspected_web_contents, true, action, "");
 }
 
 // static
@@ -502,8 +508,10 @@ void DevToolsWindow::InspectElement(
   base::TimeTicks start_time = base::TimeTicks::Now();
   // TODO(loislo): we should initiate DevTools window opening from within
   // renderer. Otherwise, we still can hit a race condition here.
-  DevToolsWindow* window = OpenDevToolsWindow(inspected_web_contents);
-  if (should_measure_time)
+  OpenDevToolsWindow(inspected_web_contents);
+
+  DevToolsWindow* window = FindDevToolsWindow(agent.get());
+  if (should_measure_time && window)
     window->inspect_element_start_time_ = start_time;
 }