Merge 107999 - gtk: fix more fullscreen bugs

chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 467 matching lines @@
 
   SetChevronState();
 }
 
 void BookmarkBarGtk::Hide(BookmarkBar::State old_state,
                           BookmarkBar::AnimateChangeType animate_type) {
   UpdateDetachedState(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.
   if (slide_animation_.IsShowing() &&
       animate_type == BookmarkBar::ANIMATE_STATE_CHANGE) {
     slide_animation_.Hide();
   } else {
     gtk_widget_hide(bookmark_hbox_);
     slide_animation_.Reset(0);
     AnimationProgressed(&slide_animation_);
@@ skipping 972 matching lines @@
 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() {
   GtkDestDefaults dest_defaults =
       *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL :
                                  GTK_DEST_DEFAULT_DROP;
   gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction);
   gtk_drag_dest_set(other_bookmarks_button_, dest_defaults,
                     NULL, 0, kDragAction);
   ui::SetDestTargetList(overflow_button_, kDestTargetList);
   ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList);
 }