Merge 53732 - Make the resize gripper invisible....

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2010 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/browser_actions_container.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/stl_util-inl.h"
@@ skipping 58 matching lines @@
 
 // The padding above and below the divider.
 static const int kDividerVerticalPadding = 9;
 
 // The margin above the chevron.
 static const int kChevronTopMargin = 9;
 
 // The margin to the right of the chevron.
 static const int kChevronRightMargin = 4;
 
-// Extra hit-area for the resize gripper.
-static const int kExtraResizeArea = 4;
+// Width for the resize area.
+static const int kResizeAreaWidth = 4;
 
 // Width of the drop indicator.
 static const int kDropIndicatorWidth = 2;
 
 // Color of the drop indicator.
 static const SkColor kDropIndicatorColor = SK_ColorBLACK;
 
 // The x offset for the drop indicator (how much we shift it by).
 static const int kDropIndicatorOffsetLtr = 3;
 static const int kDropIndicatorOffsetRtl = 9;
@@ skipping 270 matching lines @@
 // BrowserActionsContainer
 
 BrowserActionsContainer::BrowserActionsContainer(
     Browser* browser, View* owner_view)
     : profile_(browser->profile()),
       browser_(browser),
       owner_view_(owner_view),
       popup_(NULL),
       popup_button_(NULL),
       model_(NULL),
-      resize_gripper_(NULL),
       chevron_(NULL),
       overflow_menu_(NULL),
       suppress_chevron_(false),
       resize_amount_(0),
       animation_target_size_(0),
       drop_indicator_position_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(show_menu_task_factory_(this)) {
   SetID(VIEW_ID_BROWSER_ACTION_TOOLBAR);
 
   if (profile_->GetExtensionsService()) {
     model_ = profile_->GetExtensionsService()->toolbar_model();
     model_->AddObserver(this);
   }
   resize_animation_.reset(new SlideAnimation(this));
-  resize_gripper_ = new views::ResizeGripper(this);
-  resize_gripper_->SetAccessibleName(
-      l10n_util::GetString(IDS_ACCNAME_SEPARATOR));
-  resize_gripper_->SetVisible(false);
-  AddChildView(resize_gripper_);
+  resize_area_ = new views::ResizeArea(this);
+  resize_area_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_SEPARATOR));
+  AddChildView(resize_area_);
 
   // TODO(glen): Come up with a new bitmap for the chevron.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SkBitmap* chevron_image = rb.GetBitmapNamed(IDR_BOOKMARK_BAR_CHEVRONS);
   chevron_ = new views::MenuButton(NULL, std::wstring(), this, false);
   chevron_->SetVisible(false);
   chevron_->SetIcon(*chevron_image);
   chevron_->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_EXTENSIONS_CHEVRON));
   // Chevron contains >> that should point left in LTR locales.
@@ skipping 112 matching lines @@
     for (size_t i = 0; i < browser_action_views_.size(); ++i)
       RemoveChildView(browser_action_views_[i]);
     STLDeleteContainerPointers(browser_action_views_.begin(),
                                browser_action_views_.end());
     browser_action_views_.clear();
   }
 }
 
 void BrowserActionsContainer::OnBrowserActionVisibilityChanged() {
   SetVisible(browser_action_views_.size() > 0);
-  resize_gripper_->SetVisible(browser_action_views_.size() > 0);
-
   owner_view_->Layout();
   owner_view_->SchedulePaint();
 }
 
 void BrowserActionsContainer::HidePopup() {
   if (popup_)
     popup_->Close();
 }
 
 void BrowserActionsContainer::TestExecuteBrowserAction(int index) {
@@ skipping 75 matching lines @@
   return gfx::Size(width, kButtonSize);
 }
 
 void BrowserActionsContainer::Layout() {
   // The parent can be visible, but collapsed. In this case we don't
   // want the browser action container to be visible.
   ToolbarView* parent = reinterpret_cast<ToolbarView*>(GetParent());
 
   if (browser_action_views_.size() == 0 || parent->collapsed()) {
     SetVisible(false);
-    resize_gripper_->SetVisible(false);
     chevron_->SetVisible(false);
     return;
   } else {
     SetVisible(true);
-    resize_gripper_->SetVisible(true);
   }
 
-  int x = 0;
-  if (resize_gripper_->IsVisible()) {
-    // We'll draw the resize gripper a little wider, to add some invisible hit
-    // target area - but we don't account for it anywhere.
-    gfx::Size sz = resize_gripper_->GetPreferredSize();
-    resize_gripper_->SetBounds(x, (height() - sz.height()) / 2 + 1,
-                               sz.width() + kExtraResizeArea, sz.height());
-    x += sz.width();
-  }
+  resize_area_->SetBounds(0, 0, kResizeAreaWidth, height());
+  int x = kResizeAreaWidth;
 
   x += base::i18n::IsRTL() ? kHorizontalPaddingRtl : kHorizontalPadding;
 
   // Calculate if all icons fit without showing the chevron. We need to know
   // this beforehand, because showing the chevron will decrease the space that
   // we have to draw the visible ones (ie. if one icon is visible and another
   // doesn't have enough room).
   int last_x_of_icons = x +
       (browser_action_views_.size() * kButtonSize) +
       ((browser_action_views_.size() - 1) *
@@ skipping 248 matching lines @@
     int pixelWidth, bool allow_shrink_to_minimum) const {
   // Calculate the width of one icon.
   int icon_width = (kButtonSize + kBrowserActionButtonPadding);
 
   // Calculate pixel count for the area not used by the icons.
   int extras = WidthOfNonIconArea();
 
   size_t icon_count = 0u;
   if (pixelWidth >= 0) {
     // Caller wants to know how many icons fit within a given space so we start
-    // by subtracting the padding, gripper and dividers.
+    // by subtracting the padding, resize area and dividers.
     int icon_area = pixelWidth - extras;
     icon_area = std::max(0, icon_area);
 
     // Make sure we never throw an icon into the chevron menu just because
     // there isn't enough enough space for the invisible padding around buttons.
     icon_area += kBrowserActionButtonPadding - 1;
 
     // Count the number of icons that fit within that area.
     icon_count = icon_area / icon_width;
 
@@ skipping 128 matching lines @@
   else
     chevron_->SetVisible(true);
   container_size_ = gfx::Size(IconCountToWidth(visible_actions), kButtonSize);
 }
 
 int BrowserActionsContainer::WidthOfNonIconArea() const {
   int chevron_size = (chevron_->IsVisible()) ?
                      chevron_->GetPreferredSize().width() : 0;
   int padding = base::i18n::IsRTL() ?
       kHorizontalPaddingRtl : kHorizontalPadding;
-  return resize_gripper_->GetPreferredSize().width() + padding +
-         chevron_size + kChevronRightMargin + kDividerHorizontalMargin;
+  return kResizeAreaWidth + padding + chevron_size + kChevronRightMargin +
+      kDividerHorizontalMargin;
 }
 
 int BrowserActionsContainer::IconCountToWidth(int icons) const {
   DCHECK_GE(icons, 0);
   if (icons == 0)
     return ContainerMinSize();
 
   int icon_width = kButtonSize + kBrowserActionButtonPadding;
 
   return WidthOfNonIconArea() + (icons * icon_width);
 }
 
 int BrowserActionsContainer::ContainerMinSize() const {
-  return resize_gripper_->width() + chevron_->width() + kChevronRightMargin;
+  return kResizeAreaWidth + chevron_->width() + kChevronRightMargin;
 }
 
 void BrowserActionsContainer::Animate(Tween::Type tween_type, int target_size) {
   if (!disable_animations_during_testing_) {
     // Animate! We have to set the animation_target_size_ after calling Reset(),
     // because that could end up calling AnimationEnded which clears the value.
     resize_animation_->Reset();
     resize_animation_->SetTweenType(tween_type);
     animation_target_size_ = target_size;
     resize_animation_->Show();
@@ skipping 81 matching lines @@
   popup_ = NULL;
   popup_button_->SetButtonNotPushed();
   popup_button_ = NULL;
 }
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return (!profile_->IsOffTheRecord() ||
           profile_->GetExtensionsService()->IsIncognitoEnabled(extension));
 }