reapply r107999

reapply r107999

my last patch r108172 uninentionally reverted r107999 (due to my own fumbilng with git). So this re-applies it.

TBR=erg

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=108176

[Elliot Glaysher, 2011-11-01 21:46:47]

rubber stamp lgtm

On Tue, Nov 1, 2011 at 2:46 PM,  <estade@chromium.org> wrote:
> Reviewers: Elliot Glaysher,
>
> Description:
> reapply r107999
>
> my last patch r108172 uninentionally reverted r107999 (due to my own
> fumbilng
> with git). So this re-applies it.
>
> TBR=erg
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=108176
>
> Please review this at http://codereview.chromium.org/8372046/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
>  M chrome/browser/ui/gtk/browser_window_gtk.cc
>
>
> Index: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
> diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
> b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
> index
>
8502fde4d6c4de03ca1138b7ceada9f292fb248f..d30c9c35fd9f2aa407a2a88ce5e0949ec71d54eb
> 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.
> Index: 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
>
6ca3ca0f15048539f7362ad8bacf4a447a0fb190..b4b2df230430d78fa028c8430c20014b36e0eceb
> 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();
>
>
>