[chromium-reviews] Make BrowserView layout both extension shelf and bookmarks bar if toolstrips ...

chrome/browser/views/extensions/extension_shelf.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/extensions/extension_shelf.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
@@ skipping 687 matching lines @@
 }
 
 gfx::Size ExtensionShelf::GetPreferredSize() {
   return LayoutItems(true);
 }
 
 void ExtensionShelf::ChildPreferredSizeChanged(View* child) {
   Toolstrip *toolstrip = ToolstripForView(static_cast<ExtensionView*>(child));
   if (!toolstrip)
     return;
-  Layout();
+
+  PreferredSizeChanged();
 }
 
 void ExtensionShelf::Layout() {
   LayoutItems(false);
 }
 
 
 void ExtensionShelf::OnMouseEntered(const views::MouseEvent& event) {
 }
 
@@ skipping 298 matching lines @@
 
 bool ExtensionShelf::IsAlwaysShown() {
   Profile* profile = browser_->profile();
   return profile->GetPrefs()->GetBoolean(prefs::kShowExtensionShelf);
 }
 
 bool ExtensionShelf::OnNewTabPage() {
   return (browser_ && browser_->GetSelectedTabContents() &&
       browser_->GetSelectedTabContents()->IsExtensionShelfAlwaysVisible());
 }