summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/browser_window_gtk.cc
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-29 16:40:43 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-29 16:40:43 +0000
commit4750b0fab8e19140a8320f293bacc721a7214142 (patch)
treed62572a4d05f65d67bb3fc8808f57e7030c631bb /chrome/browser/ui/gtk/browser_window_gtk.cc
parente5cac7c1e9212850142ed1090317cd6a536f83a6 (diff)
downloadchromium_src-4750b0fab8e19140a8320f293bacc721a7214142.zip
chromium_src-4750b0fab8e19140a8320f293bacc721a7214142.tar.gz
chromium_src-4750b0fab8e19140a8320f293bacc721a7214142.tar.bz2
DevTools: [Linux] "dock to right" is broken after turning a tab into a window.
Re-landing r161932. Review URL: https://chromiumcodereview.appspot.com/11147020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index a1c3026..92a4ba3 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -223,6 +223,7 @@ GQuark GetBrowserWindowQuarkKey() {
BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
: window_(NULL),
+ window_has_shown_(false),
window_container_(NULL),
window_vbox_(NULL),
render_area_vbox_(NULL),
@@ -597,7 +598,10 @@ void BrowserWindowGtk::Show() {
// size.
gtk_widget_set_size_request(contents_container_->widget(), -1, -1);
+ window_has_shown_ = true;
browser()->OnWindowDidShow();
+ if (devtools_window_)
+ UpdateDevToolsSplitPosition();
}
void BrowserWindowGtk::ShowInactive() {
@@ -673,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
@@ -2385,6 +2390,8 @@ void BrowserWindowGtk::HideDevToolsContainer() {
}
void BrowserWindowGtk::UpdateDevToolsSplitPosition() {
+ if (!window_has_shown_)
+ return;
GtkAllocation contents_rect;
gtk_widget_get_allocation(contents_vsplit_, &contents_rect);