From 2f693fe05f27bf656d94311cc9c1980ad0edf65a Mon Sep 17 00:00:00 2001 From: "pfeldman@chromium.org" Date: Mon, 15 Oct 2012 20:05:59 +0000 Subject: DevTools: [Linux] "dock to right" is broken after turning a tab into a window. BUG=122772 Review URL: https://chromiumcodereview.appspot.com/11147020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161932 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/gtk/browser_window_gtk.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc') diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 4ac7cf0..78e2977 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -229,6 +229,7 @@ GQuark GetBrowserWindowQuarkKey() { BrowserWindowGtk::BrowserWindowGtk(Browser* browser) : window_(NULL), + window_has_shown_(false), window_container_(NULL), window_vbox_(NULL), render_area_vbox_(NULL), @@ -603,6 +604,8 @@ void BrowserWindowGtk::Show() { gtk_widget_set_size_request(contents_container_->widget(), -1, -1); browser()->OnWindowDidShow(); + window_has_shown_ = true; + UpdateDevTools(); } void BrowserWindowGtk::ShowInactive() { @@ -674,6 +677,7 @@ void BrowserWindowGtk::Close() { // To help catch bugs in any event handlers that might get fired during the // destruction, set window_ to NULL before any handlers will run. window_ = NULL; + window_has_shown_ = false; titlebar_->set_window(NULL); // We don't want GlobalMenuBar handling any notifications or commands after @@ -1349,6 +1353,8 @@ void BrowserWindowGtk::MaybeShowBookmarkBar(bool animate) { } void BrowserWindowGtk::UpdateDevToolsForContents(WebContents* contents) { + if (!window_has_shown_) + return; TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::UpdateDevToolsForContents"); TabContents* old_devtools = devtools_container_->tab(); TabContents* devtools_contents = contents ? -- cgit v1.1