diff options
| author | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 22:46:19 +0000 |
|---|---|---|
| committer | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 22:47:50 +0000 |
| commit | d3607a09b3587fe43705b932c99193fbc951c1e8 (patch) | |
| tree | f1e2404e9e151fa2ff88f5f434c6a3277d637e56 /chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm | |
| parent | ed50a2fd22c824e01ba754b91f81cbdbbc3c7f10 (diff) | |
| download | chromium_src-d3607a09b3587fe43705b932c99193fbc951c1e8.zip chromium_src-d3607a09b3587fe43705b932c99193fbc951c1e8.tar.gz chromium_src-d3607a09b3587fe43705b932c99193fbc951c1e8.tar.bz2 | |
[DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManager.
Previously, client used methods on DevToolsManager passing |this| to most of them.
Instead, it should hold a scoped_refptr to inspected DevToolsAgentHost and talk
to it directly. This creates a single clean entry point for the client, and allows
in the future to handle browser-wide protocol messages and debug multiple hosts at once.
BUG=401073
TBR=kalman@chromium.org
Review URL: https://codereview.chromium.org/449043002
Cr-Commit-Position: refs/heads/master@{#288452}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm index 814f202..b5dbd4e 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm @@ -20,7 +20,6 @@ #import "chrome/browser/ui/cocoa/info_bubble_window.h" #include "components/web_modal/popup_manager.h" #include "content/public/browser/devtools_agent_host.h" -#include "content/public/browser/devtools_manager.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" @@ -97,13 +96,11 @@ class DevtoolsNotificationBridge : public content::NotificationObserver { devtools_callback_(base::Bind( &DevtoolsNotificationBridge::OnDevToolsStateChanged, base::Unretained(this))) { - content::DevToolsManager::GetInstance()->AddAgentStateCallback( - devtools_callback_); + content::DevToolsAgentHost::AddAgentStateCallback(devtools_callback_); } virtual ~DevtoolsNotificationBridge() { - content::DevToolsManager::GetInstance()->RemoveAgentStateCallback( - devtools_callback_); + content::DevToolsAgentHost::RemoveAgentStateCallback(devtools_callback_); } void OnDevToolsStateChanged(content::DevToolsAgentHost* agent_host, |