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 b519b0eb4e61a6085809ac89d5358eb825bfd4ec..412c76904e9b5b609500a8718635aa22fa2ff4b7 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1260,7 +1260,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);
   }
 }
 
@@ -2238,11 +2238,15 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
 
   // Don't allow the bookmark bar to be shown in suggestions mode or
   // for instant extended api, non-NTP modes when it's detached.
-  if (search_model_->mode().is_search_suggestions() ||
-      (chrome::search::IsInstantExtendedAPIEnabled(profile_) &&
-       !search_model_->mode().is_ntp() && state == BookmarkBar::DETACHED)) {
-    state = BookmarkBar::HIDDEN;
+  // TODO(sail): Stop hidding the bookmark bar on other platforms.
+#if !defined(OS_MACOSX)
+  if (chrome::search::IsInstantExtendedAPIEnabled(profile_)) {
+    if (search_model_->mode().is_search_suggestions() ||
+        (!search_model_->mode().is_ntp() && state == BookmarkBar::DETACHED)) {

[dhollowa, 2013/01/18 00:55:11]

nit: no {} needed now

[sail, 2013/01/18 01:37:09]

I find braces around if statements with multi-line conditionals very help. Mind
if I keep it this way?

[dhollowa, 2013/01/18 15:59:58]

That's fine.

+      state = BookmarkBar::HIDDEN;
+    }
   }
+#endif
 
   if (state == bookmark_bar_state_)
     return;
@@ -2259,15 +2263,19 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
     return;
   }
 
+  bool shouldAnimate = reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE;
+
   // 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 &&
-        !search_model_->mode().is_ntp()) ||
-       reason == BOOKMARK_BAR_STATE_CHANGE_INSTANT_PREVIEW_STATE) ?
+  // TODO(sail) Remove this once other platforms have removed the bottom
+  // bookmark bar.
+#if !defined(OS_MACOSX)
+  shouldAnimate = shouldAnimate && !search_model_->mode().is_ntp();

[dhollowa, 2013/01/18 00:55:11]

I guess this should be wrapped in an if (IsInstantExtended...) block as well
because DEFAULT mode could be because the feature is turned off.

[sail, 2013/01/18 01:37:09]

Done.
Good catch.

+#endif
+
+  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 {