chrome/browser/ui/views/extensions/extension_popup.cc - Issue 449043002: [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/views/extensions/extension_popup.cc

Issue 449043002: [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_popup_controller.mm ('k') | chrome/browser/ui/webui/inspect_ui.cc » ('j') | content/public/browser/devtools_agent_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/extensions/extension_popup.cc

diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc

index 06a8bc02159f410f46bd9fb0c2efd01aeb147a9c..4673871e644af756c73154e60934aef4d01fccab 100644

--- a/chrome/browser/ui/views/extensions/extension_popup.cc

+++ b/chrome/browser/ui/views/extensions/extension_popup.cc

@@ -12,7 +12,6 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/tabs/tab_strip_model.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_source.h"

#include "content/public/browser/render_view_host.h"

@@ -69,15 +68,13 @@ ExtensionPopup::ExtensionPopup(extensions::ExtensionViewHost* host,

this,

extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,

content::Source<content::BrowserContext>(host->browser_context()));

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

- devtools_callback_);

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

GetExtensionView(host)->GetBrowser()->tab_strip_model()->AddObserver(this);

}

ExtensionPopup::~ExtensionPopup() {

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

- devtools_callback_);

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

GetExtensionView(

host_.get())->GetBrowser()->tab_strip_model()->RemoveObserver(this);