Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3504)

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 251653003: Introduces DevToolsManagerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Register OpenDevToolsWindowForWorkerCallback to DevToolsManager Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_window.h » ('j') | content/public/browser/devtools_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index d84585d1cdef1629afad49d2ab019c8f900cff10..80631fce17027e31fed03025dc6a178a53b749b1 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -50,6 +50,7 @@
#include "chrome/browser/component_updater/swiftshader_component_installer.h"
#include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
#include "chrome/browser/defaults.h"
+#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/startup_helper.h"
#include "chrome/browser/feedback/feedback_profile_observer.h"
@@ -116,6 +117,7 @@
#include "components/startup_metric_utils/startup_metric_utils.h"
#include "components/translate/core/browser/translate_download_manager.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/devtools_manager.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
@@ -1253,8 +1255,12 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
content::WebUIControllerFactory::RegisterFactory(
ChromeWebUIControllerFactory::GetInstance());
- // NaClBrowserDelegateImpl is accessed inside PostProfileInit().
- // So make sure to create it before that.
+ content::DevToolsManager::GetInstance()
+ ->RegisterOpenDevToolsWindowForWorkerCallback(
+ DevToolsWindow::GetOpenDevToolsWindowForWorkerCallback());
+
+// NaClBrowserDelegateImpl is accessed inside PostProfileInit().
+// So make sure to create it before that.
#if !defined(DISABLE_NACL)
NaClBrowserDelegateImpl* delegate = new NaClBrowserDelegateImpl(
extensions::ExtensionSystem::Get(profile_)->info_map());
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_window.h » ('j') | content/public/browser/devtools_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698