Do not animate detaching / undetaching the bookmark bar in immersive mode

chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 702 matching lines @@
 
 void BrowserView::UpdateTitleBar() {
   frame_->UpdateWindowTitle();
   if (ShouldShowWindowIcon() && !loading_animation_timer_.IsRunning())
     frame_->UpdateWindowIcon();
 }
 
 void BrowserView::BookmarkBarStateChanged(
     BookmarkBar::AnimateChangeType change_type) {
   if (bookmark_bar_view_.get()) {
-    bookmark_bar_view_->SetBookmarkBarState(
-        browser_->bookmark_bar_state(), change_type);
+    BookmarkBar::State new_state = browser_->bookmark_bar_state();
+
+    bool to_or_from_detached_state = (new_state == BookmarkBar::DETACHED) ||

[James Cook, 2013/04/25 21:45:21]

optional nit: This variable name is fine, but long. detached_changed? 
detached_state_changed?

+        bookmark_bar_view_->IsDetached();
+    // We don't properly support animating the bookmark bar to and from the
+    // detached state in immersive fullscreen.
+    if (to_or_from_detached_state && immersive_mode_controller_->IsEnabled())
+      change_type = BookmarkBar::DONT_ANIMATE_STATE_CHANGE;
+
+    bookmark_bar_view_->SetBookmarkBarState(new_state, change_type);
   }
   if (MaybeShowBookmarkBar(GetActiveWebContents()))
     Layout();
 }
 
 void BrowserView::UpdateDevTools() {
   UpdateDevToolsForContents(GetActiveWebContents());
   Layout();
 }
 
@@ skipping 1389 matching lines @@
         BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
     GetBrowserViewLayout()->set_bookmark_bar(bookmark_bar_view_.get());
   }
   bookmark_bar_view_->SetVisible(show_bookmark_bar);
   bookmark_bar_view_->SetPageNavigator(contents);
 
   // Update parenting for the bookmark bar. This may detach it from all views.
   bool needs_layout = false;
   views::View* new_parent = NULL;
   if (show_bookmark_bar) {
-    if (browser_->bookmark_bar_state() == BookmarkBar::DETACHED)
+    if (bookmark_bar_view_->IsDetached())
       new_parent = this;
     else
       new_parent = top_container_;
   }
   if (new_parent != bookmark_bar_view_->parent()) {
     SetBookmarkBarParent(new_parent);
     needs_layout = true;
   }
 
   // Check for updates to the desired size.
@@ skipping 527 matching lines @@
 
   Browser* modal_browser =
       chrome::FindBrowserWithWebContents(active_dialog->web_contents());
   if (modal_browser && (browser_ != modal_browser)) {
     modal_browser->window()->FlashFrame(true);
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }