[chromium-reviews] Remove jankiness from bookmark animation for --show-extensions-on-top....

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2009 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/views/frame/browser_view.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
@@ skipping 1861 matching lines @@
     if (ShowExtensionsOnTop())
       extension_shelf_->SetVisible(false);
     return y;
   }
 
   int bookmark_bar_height = bookmark_bar_view_->GetPreferredSize().height();
   y -= kSeparationLineHeight + (bookmark_bar_view_->IsDetachedStyle() ?
       0 : bookmark_bar_view_->GetToolbarOverlap(false));
 
   if (ShowExtensionsOnTop()) {
-    int extensionshelf_height = extension_shelf_->GetPreferredSize().height();
-    if (extensionshelf_height >= bookmark_bar_height)
-      bookmark_bar_height = extensionshelf_height;
-
     if (!bookmark_bar_view_->IsDetachedStyle()) {
       int extension_shelf_width =
           extension_shelf_->GetPreferredSize().width();
       int bookmark_bar_given_width = width() - extension_shelf_width;
       int minimum_allowed_bookmark_bar_width =
           bookmark_bar_view_->GetMinimumSize().width();
       if (bookmark_bar_given_width < minimum_allowed_bookmark_bar_width) {
         // The bookmark bar cannot compromise on its width any more. The
         // extension shelf needs to shrink now.
         extension_shelf_width =
@@ skipping 408 matching lines @@
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }
 
 // static
 void BrowserList::AllBrowsersClosed() {
   views::Window::CloseAllSecondaryWindows();
 }