chrome/browser/external_tab_container_win.cc - Issue 7322004: DevTools: devtools manager should know nothing about DevToolsWindow

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/external_tab_container_win.cc

Issue 7322004: DevTools: devtools manager should know nothing about DevToolsWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comments addressed Created 9 years, 5 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:

Index: chrome/browser/external_tab_container_win.cc

diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc

index e10523f816f07d71fc55b6c94ad8c549ae3ae11b..83c80a81190e232d29278b9b63192eb07e7081a5 100644

--- a/chrome/browser/external_tab_container_win.cc

+++ b/chrome/browser/external_tab_container_win.cc

@@ -34,8 +34,8 @@

#include "chrome/common/chrome_constants.h"

#include "chrome/common/render_messages.h"

#include "chrome/common/url_constants.h"

-#include "content/browser/debugger/devtools_manager.h"

#include "content/browser/debugger/devtools_toggle_action.h"

+#include "content/browser/debugger/devtools_window.h"

#include "content/browser/load_notification_details.h"

#include "content/browser/renderer_host/render_process_host.h"

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

@@ -964,16 +964,16 @@ bool ExternalTabContainer::AcceleratorPressed(

host->Send(new ViewMsg_Zoom(host->routing_id(), PageZoom::ZOOM_OUT));

break;

case IDC_DEV_TOOLS:

- DevToolsManager::GetInstance()->ToggleDevToolsWindow(

+ DevToolsWindow::ToggleDevToolsWindow(

tab_contents_->render_view_host(), DEVTOOLS_TOGGLE_ACTION_NONE);

break;

case IDC_DEV_TOOLS_CONSOLE:

- DevToolsManager::GetInstance()->ToggleDevToolsWindow(

+ DevToolsWindow::ToggleDevToolsWindow(

tab_contents_->render_view_host(),

DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);

break;

case IDC_DEV_TOOLS_INSPECT:

- DevToolsManager::GetInstance()->ToggleDevToolsWindow(

+ DevToolsWindow::ToggleDevToolsWindow(

tab_contents_->render_view_host(),

DEVTOOLS_TOGGLE_ACTION_INSPECT);

break;