diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 21:45:59 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 21:45:59 +0000 |
| commit | 0dbbfcabd920a3b4e3264a3a5bfe552c70d2f43d (patch) | |
| tree | 84121b314389fa0faccea99995e1edbd709782a7 /chrome | |
| parent | 1c3e3cb668b09d351e70c009a7107cf04b8c6397 (diff) | |
| download | chromium_src-0dbbfcabd920a3b4e3264a3a5bfe552c70d2f43d.zip chromium_src-0dbbfcabd920a3b4e3264a3a5bfe552c70d2f43d.tar.gz chromium_src-0dbbfcabd920a3b4e3264a3a5bfe552c70d2f43d.tar.bz2 | |
reapply r107999
my last patch r108172 uninentionally reverted r107999 (due to my own fumbilng with git). So this re-applies it.
TBR=erg
Review URL: http://codereview.chromium.org/8372046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc index 8502fde..d30c9c3 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc @@ -456,7 +456,8 @@ void BookmarkBarGtk::Hide(BookmarkBar::State old_state, // After coming out of fullscreen, the browser window sets the bookmark bar // to the "hidden" state, which means we need to show our minimum height. - gtk_widget_show(widget()); + if (!window_->IsFullscreen()) + gtk_widget_show(widget()); CalculateMaxHeight(); // Sometimes we get called without a matching call to open. If that happens // then force hide. diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 6ca3ca0..b4b2df2 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -1456,8 +1456,10 @@ gboolean BrowserWindowGtk::OnWindowState(GtkWidget* sender, GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION)); } + gtk_widget_hide(titlebar_widget()); gtk_widget_hide(toolbar_border_); } else { + gtk_widget_show(titlebar_widget()); fullscreen_exit_bubble_.reset(); UpdateCustomFrame(); ShowSupportedWindowFeatures(); |