summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 14:59:26 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 14:59:26 +0000
commit3063a77c59d56454be74ddce03a779305768f988 (patch)
tree632c36cdf5d0c6c0315a0829116ef10f896798f0
parentd842d84172f863208c239b2cfddc474dff7b7e3a (diff)
downloadchromium_src-3063a77c59d56454be74ddce03a779305768f988.zip
chromium_src-3063a77c59d56454be74ddce03a779305768f988.tar.gz
chromium_src-3063a77c59d56454be74ddce03a779305768f988.tar.bz2
DevTools: Follow up to r31226. Fixed one of the toggledevtools calls.
tbr=apavlov git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31229 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/debugger/devtools_manager.cc2
-rw-r--r--chrome/browser/debugger/devtools_window.cc4
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index 41194e0..fbdf18b 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -120,7 +120,7 @@ void DevToolsManager::UndockWindow(RenderViewHost* client_rvh) {
}
void DevToolsManager::OpenDevToolsWindow(RenderViewHost* inspected_rvh) {
- ToggleDevToolsWindow(inspected_rvh, true);
+ ToggleDevToolsWindow(inspected_rvh, true, false);
}
void DevToolsManager::ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index e5fe7be..273ab4e 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -221,8 +221,10 @@ void DevToolsWindow::Observe(NotificationType type,
L"", docked_ ? L"WebInspector.setAttachedWindow(true);" :
L"WebInspector.setAttachedWindow(false);");
is_loaded_ = true;
- if (open_console_on_load_)
+ if (open_console_on_load_) {
OpenConsole();
+ open_console_on_load_ = false;
+ }
} else if (type == NotificationType::TAB_CLOSING) {
if (Source<NavigationController>(source).ptr() ==
&tab_contents_->controller()) {