chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm - Issue 467653002: Revert of [DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

Issue 467653002: Revert of [DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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 | « chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller_browsertest.mm ('k') | chrome/browser/ui/views/extensions/extension_popup.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

index b5dbd4ed881e35f8c51b6506d6eab33cba4f65be..814f202195daeba29f48427de4c83245a2d1159d 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

@@ -20,6 +20,7 @@

#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"

@@ -96,11 +97,13 @@

devtools_callback_(base::Bind(

&DevtoolsNotificationBridge::OnDevToolsStateChanged,

base::Unretained(this))) {

- content::DevToolsAgentHost::AddAgentStateCallback(devtools_callback_);

+ content::DevToolsManager::GetInstance()->AddAgentStateCallback(

+ devtools_callback_);

}

virtual ~DevtoolsNotificationBridge() {

- content::DevToolsAgentHost::RemoveAgentStateCallback(devtools_callback_);

+ content::DevToolsManager::GetInstance()->RemoveAgentStateCallback(

+ devtools_callback_);

}

void OnDevToolsStateChanged(content::DevToolsAgentHost* agent_host,