summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 07:24:49 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 07:24:49 +0000
commitd33a47ce26330b024214b0ecfb8b2c5cda218233 (patch)
treecf2e53aa1f65c379095199c252c20630553c775d /chrome/browser/gtk
parent7b7bbbe82533e74b60a924dc4d563f6d3f07482c (diff)
downloadchromium_src-d33a47ce26330b024214b0ecfb8b2c5cda218233.zip
chromium_src-d33a47ce26330b024214b0ecfb8b2c5cda218233.tar.gz
chromium_src-d33a47ce26330b024214b0ecfb8b2c5cda218233.tar.bz2
Revert "Make DevTools open docked by default for chrome os."
This reverts commit r41641 because all the devtools interactive_ui_tests are failing. TBR=xiyuan Review URL: http://codereview.chromium.org/1007004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index de825c1..b49d501 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1178,6 +1178,13 @@ void BrowserWindowGtk::UpdateDevToolsForContents(TabContents* contents) {
TabContents* devtools_contents = contents ?
DevToolsWindow::GetDevToolsContents(contents) : NULL;
devtools_container_->SetTabContents(devtools_contents);
+ if (devtools_contents) {
+ // TabContentsViewGtk::WasShown is not called when tab contents is shown by
+ // anything other than user selecting a Tab.
+ // See TabContentsViewWin::OnWindowPosChanged for reference on how it should
+ // be implemented.
+ devtools_contents->ShowContents();
+ }
bool should_show = old_devtools == NULL && devtools_contents != NULL;
bool should_hide = old_devtools != NULL && devtools_contents == NULL;