Alternate NTP: Don't hide bookmark bar on instant

chrome/browser/ui/browser.cc

 // Copyright 2012 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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 2218 matching lines @@
   } else {
     WebContents* web_contents = tab_strip_model_->GetActiveWebContents();
     BookmarkTabHelper* bookmark_tab_helper =
         web_contents ? BookmarkTabHelper::FromWebContents(web_contents) : NULL;
     if (bookmark_tab_helper && bookmark_tab_helper->ShouldShowBookmarkBar())
       state = BookmarkBar::DETACHED;
     else
       state = BookmarkBar::HIDDEN;
   }
 
+

[dhollowa, 2013/01/17 17:47:58]

nit: extra line

[sail, 2013/01/17 18:17:12]

Done.

   // Don't allow the bookmark bar to be shown in suggestions mode or
   // for instant extended api, non-NTP modes when it's detached.
+  // TODO(sail): Stop hidding the bookmark bar on other platforms.
+#if !defined(OS_MACOSX)
   if (search_model_->mode().is_search_suggestions() ||
       (chrome::search::IsInstantExtendedAPIEnabled(profile_) &&

[dhollowa, 2013/01/17 17:47:58]

nit: The |IsInstantExtendedAPIEnabled| part of this clause seems a bit odd when
it follows the |is_search_suggestions| tests.  It would read more sensibly if
the IIEAE test was pulled out to wrap the whole thing.

[sail, 2013/01/17 18:17:12]

Done.

        !search_model_->mode().is_ntp() && state == BookmarkBar::DETACHED)) {
     state = BookmarkBar::HIDDEN;
   }
+#endif
 
   if (state == bookmark_bar_state_)
     return;
 
   bookmark_bar_state_ = state;
 
   if (!window_)
     return;  // This is called from the constructor when window_ is NULL.
 
   if (reason == BOOKMARK_BAR_STATE_CHANGE_TAB_SWITCH) {
     // Don't notify BrowserWindow on a tab switch as at the time this is invoked
     // BrowserWindow hasn't yet switched tabs. The BrowserWindow implementations
     // end up querying state once they process the tab switch.
     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()) ||
+      reason == BOOKMARK_BAR_STATE_CHANGE_INSTANT_PREVIEW_STATE;

[kuan, 2013/01/17 18:25:51]

per latest discussion, we don't want to animate for reason
CHANGE_INSTANT_PREVIEW_STATE anymore.  cld u disable it here for all platforms? 
i think i added the new reason just for the purpose of animation, so maybe we
can remove the reason too, and just use CHANGE_TAB_STATE.  thx!

[sail, 2013/01/17 18:54:55]

Done.

+#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 {
   // On Mac, fullscreen mode has most normal things (in a slide-down panel). On
   // other platforms, we hide some controls when in fullscreen mode.
 #if defined(OS_MACOSX)
   return false;
 #endif
   return window_ && window_->IsFullscreen();
 }
@@ skipping 72 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }