Alternate NTP: Don't hide bookmark bar on instant

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 7130dfcc52219e75ff7258b1e365330dab60f817..0f49c3bfa66e63fcb44f37556c7fd7291864ba1c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1252,7 +1252,7 @@ void Browser::MaybeUpdateBookmarkBarStateForInstantPreview(
   // bookmark bar.
   if (mode.is_search_suggestions() &&
       bookmark_bar_state_ == BookmarkBar::SHOW) {
-    UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_INSTANT_PREVIEW_STATE);
+    UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
   }
 }
 
@@ -2229,8 +2229,10 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
   }
 
   // Don't allow the bookmark bar to be shown in suggestions mode.
+#if !defined(OS_MACOSX)
   if (search_model_->mode().is_search_suggestions())
     state = BookmarkBar::HIDDEN;
+#endif

[Nico, 2013/01/23 21:00:04]

Why is this different on OS X than elsewhere? This looks wrong.

 
   if (state == bookmark_bar_state_)
     return;
@@ -2247,14 +2249,10 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
     return;
   }
 
-  // Don't animate if mode is |NTP| because the bookmark is attached at top when
-  // pref is on and detached at bottom when off.
-  BookmarkBar::AnimateChangeType animate_type =
-      (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE ||
-       reason == BOOKMARK_BAR_STATE_CHANGE_INSTANT_PREVIEW_STATE) ?
+  bool shouldAnimate = reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE;
+  window_->BookmarkBarStateChanged(shouldAnimate ?
       BookmarkBar::ANIMATE_STATE_CHANGE :
-      BookmarkBar::DONT_ANIMATE_STATE_CHANGE;
-  window_->BookmarkBarStateChanged(animate_type);
+      BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
 }
 
 bool Browser::ShouldHideUIForFullscreen() const {