Chromium Code Reviews| 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..cb63fe57055a9937f0856a013caf98272475dc47 100644 |
| --- a/chrome/browser/devtools/devtools_window.cc |
| +++ b/chrome/browser/devtools/devtools_window.cc |
| @@ -411,14 +411,20 @@ DevToolsWindow* DevToolsWindow::CreateDevToolsWindowForWorker( |
| // static |
| DevToolsWindow* DevToolsWindow::OpenDevToolsWindow( |
| content::WebContents* inspected_web_contents) { |
| - return ToggleDevToolsWindow( |
| - inspected_web_contents, true, DevToolsToggleAction::Show(), ""); |
| + return DevToolsWindow::OpenDevToolsWindow( |
| + inspected_web_contents, DevToolsToggleAction::Show()); |
| } |
| // static |
| DevToolsWindow* DevToolsWindow::OpenDevToolsWindow( |
| content::WebContents* inspected_web_contents, |
| const DevToolsToggleAction& action) { |
| + Profile* profile = Profile::FromBrowserContext( |
| + inspected_web_contents->GetBrowserContext()); |
| + // If development tools disabled by policy return NULL |
|
dgozman
2015/03/03 14:07:24
nit: "null" please
|
| + if (profile->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled)) { |
| + return NULL; |
|
dgozman
2015/03/03 14:07:24
nullptr
|
| + } |
| return ToggleDevToolsWindow(inspected_web_contents, true, action, ""); |
| } |