summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/render_view_host.cc
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 14:11:44 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 14:11:44 +0000
commit45eb472a34c51038aeaee26c75cc109d3e3d3bdc (patch)
treefcc73b1bc9b272c8f44818ff62bf2f1be3ab8f92 /chrome/browser/renderer_host/render_view_host.cc
parent42f60f1d90bdbff386c7f376671b5c271149c2ed (diff)
downloadchromium_src-45eb472a34c51038aeaee26c75cc109d3e3d3bdc.zip
chromium_src-45eb472a34c51038aeaee26c75cc109d3e3d3bdc.tar.gz
chromium_src-45eb472a34c51038aeaee26c75cc109d3e3d3bdc.tar.bz2
Fix docking behaviour for devtools windows that don't have an associated browser window
BUG=40090 TEST=none Review URL: http://codereview.chromium.org/1567014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/render_view_host.cc')
-rw-r--r--chrome/browser/renderer_host/render_view_host.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 35bfec5..47debf7 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -787,10 +787,10 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
OnActivateDevToolsWindow);
IPC_MESSAGE_HANDLER(ViewHostMsg_CloseDevToolsWindow,
OnCloseDevToolsWindow);
- IPC_MESSAGE_HANDLER(ViewHostMsg_DockDevToolsWindow,
- OnDockDevToolsWindow);
- IPC_MESSAGE_HANDLER(ViewHostMsg_UndockDevToolsWindow,
- OnUndockDevToolsWindow);
+ IPC_MESSAGE_HANDLER(ViewHostMsg_RequestDockDevToolsWindow,
+ OnRequestDockDevToolsWindow);
+ IPC_MESSAGE_HANDLER(ViewHostMsg_RequestUndockDevToolsWindow,
+ OnRequestUndockDevToolsWindow);
IPC_MESSAGE_HANDLER(ViewHostMsg_DevToolsRuntimeFeatureStateChanged,
OnDevToolsRuntimeFeatureStateChanged);
IPC_MESSAGE_HANDLER(ViewHostMsg_UserMetricsRecordAction,
@@ -1445,12 +1445,12 @@ void RenderViewHost::OnCloseDevToolsWindow() {
DevToolsManager::GetInstance()->CloseWindow(this);
}
-void RenderViewHost::OnDockDevToolsWindow() {
- DevToolsManager::GetInstance()->DockWindow(this);
+void RenderViewHost::OnRequestDockDevToolsWindow() {
+ DevToolsManager::GetInstance()->RequestDockWindow(this);
}
-void RenderViewHost::OnUndockDevToolsWindow() {
- DevToolsManager::GetInstance()->UndockWindow(this);
+void RenderViewHost::OnRequestUndockDevToolsWindow() {
+ DevToolsManager::GetInstance()->RequestUndockWindow(this);
}
void RenderViewHost::OnDevToolsRuntimeFeatureStateChanged(