chrome/browser/ui/views/extensions/extension_popup.cc - Issue 442303002: DevTools: migrate DevTools APIs to use WebContents instead of RenderViewHost.

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 442303002: DevTools: migrate DevTools APIs to use WebContents instead of RenderViewHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review comments addressed. 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

« chrome/browser/devtools/devtools_window.cc ('K') | « chrome/browser/ui/panels/panel.cc ('k') | chrome/browser/ui/webui/extensions/extension_error_ui_util.cc » ('j') | chrome/browser/ui/webui/extensions/extension_error_ui_util.cc » ('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..e77df9e76d24896752efd2b90ed8e11308d70129 100644

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

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

@@ -107,7 +107,7 @@ void ExtensionPopup::OnDevToolsStateChanged(

content::DevToolsAgentHost* agent_host,

bool attached) {

// First check that the devtools are being opened on this popup.

- if (host()->render_view_host() != agent_host->GetRenderViewHost())

+ if (host()->host_contents() != agent_host->GetWebContents())

return;

if (attached) {

@@ -225,7 +225,7 @@ void ExtensionPopup::ShowBubble() {

host()->host_contents()->Focus();

if (inspect_with_devtools_) {

- DevToolsWindow::OpenDevToolsWindow(host()->render_view_host(),

- DevToolsToggleAction::ShowConsole());

+ DevToolsWindow::OpenDevToolsWindow(host()->host_contents(),

+ DevToolsToggleAction::ShowConsole());

}