Compute minimum widths for the toolbar components.

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 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/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 190 matching lines @@
     BrowserActionsContainerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void BrowserActionsContainer::RemoveObserver(
     BrowserActionsContainerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 gfx::Size BrowserActionsContainer::GetPreferredSize() {
-  if (browser_action_views_.empty())
-    return gfx::Size(ToolbarView::kStandardSpacing, 0);
-
   // We calculate the size of the view by taking the current width and
   // subtracting resize_amount_ (the latter represents how far the user is
   // resizing the view or, if animating the snapping, how far to animate it).
   // But we also clamp it to a minimum size and the maximum size, so that the
   // container can never shrink too far or take up more space than it needs. In
-  // other words: ContainerMinSize() < width() - resize < ClampTo(MAX).
-  int clamped_width = std::min(
-      std::max(ContainerMinSize(), container_width_ - resize_amount_),
+  // other words: MinimumNonemptyWidth() < width() - resize < ClampTo(MAX).
+  int preferred_width = std::min(
+      std::max(MinimumNonemptyWidth(), container_width_ - resize_amount_),
       IconCountToWidth(-1, false));
-  return gfx::Size(clamped_width, 0);
+  // Height will be ignored by the ToolbarView.
+  return gfx::Size(preferred_width, 0);
+}
+
+gfx::Size BrowserActionsContainer::GetMinimumSize() {
+  int min_width = std::min(MinimumNonemptyWidth(), IconCountToWidth(-1, false));
+  // Height will be ignored by the ToolbarView.
+  return gfx::Size(min_width, 0);
 }
 
 void BrowserActionsContainer::Layout() {
   if (browser_action_views_.empty()) {
     SetVisible(false);
     return;
   }
 
   SetVisible(true);
   resize_area_->SetBounds(0, 0, kItemSpacing, height());
@@ skipping 612 matching lines @@
   // either side of the chevron.
   int available_space = pixels - ToolbarView::kStandardSpacing -
       chevron_->GetPreferredSize().width() - kChevronSpacing -
       ToolbarView::kStandardSpacing;
   // Now we add an extra between-item padding value so the space can be divided
   // evenly by (size of icon with padding).
   return static_cast<size_t>(
       std::max(0, available_space + kItemSpacing) / IconWidth(true));
 }
 
-int BrowserActionsContainer::ContainerMinSize() const {
+int BrowserActionsContainer::MinimumNonemptyWidth() const {
   return ToolbarView::kStandardSpacing + kChevronSpacing +
       chevron_->GetPreferredSize().width() + ToolbarView::kStandardSpacing;
 }
 
 void BrowserActionsContainer::SaveDesiredSizeAndAnimate(
     gfx::Tween::Type tween_type,
     size_t num_visible_icons) {
   // Save off the desired number of visible icons.  We do this now instead of at
   // the end of the animation so that even if the browser is shut down while
   // animating, the right value will be restored on next run.
@@ skipping 55 matching lines @@
                                      views::BubbleBorder::TOP_RIGHT,
                                      show_action);
   popup_->GetWidget()->AddObserver(this);
   popup_button_ = button;
 
   // Only set button as pushed if it was triggered by a user click.
   if (should_grant)
     popup_button_->SetButtonPushed();
   return true;
 }