summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 17:02:45 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 17:02:45 +0000
commit38ab46563875871094169fb1152a8b21ebbf841f (patch)
tree1c14d216e0c5ac5621285ea4146b1ec706958bb4 /chrome/browser/gtk
parent9cd6def3b735220b4dd0d00ec5c8633a2dfa8acd (diff)
downloadchromium_src-38ab46563875871094169fb1152a8b21ebbf841f.zip
chromium_src-38ab46563875871094169fb1152a8b21ebbf841f.tar.gz
chromium_src-38ab46563875871094169fb1152a8b21ebbf841f.tar.bz2
Reland r41641 "Make DevTools open docked by default..."
- Fix DevToolsSanityTest time out. The timeout is because the tests wait for Browser closed notification. However, docked DevTools does not have its own Browser object and hence the wait times out. BUG=none TEST=none Review URL: http://codereview.chromium.org/1025005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 873ad44..e0d60adf 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1178,13 +1178,6 @@ 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;