New action box button images and supporting code

chrome/browser/ui/views/location_bar/action_box_button_view.cc

 // Copyright (c) 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/location_bar/action_box_button_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/action_box_menu.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/path.h"
+
+
+// Thickness of the top transparent area on a button image that overlaps
+// location bar border.

[Peter Kasting, 2012/10/13 00:25:29]

Nit: Don't repeat this comment

[yefimt, 2012/10/13 00:51:30]

Done.

+// static
+const int ActionBoxButtonView::kTopBorderOverlapThickness = 2;
+
+// Thickness of the bottom transparent area on a button image that overlaps
+// location bar border.
+const int kBottomBorderOverlapThickness = 2;

[Peter Kasting, 2012/10/13 00:25:29]

Nit: Eliminate this constant and rename the other variable "kBorderOverlap"
since the top and bottom border overlaps are equal

[yefimt, 2012/10/13 00:51:30]

Done.

 
 ActionBoxButtonView::ActionBoxButtonView(Browser* browser,
                                          const gfx::Point& menu_offset)
     : views::MenuButton(NULL, string16(), this, false),
       browser_(browser),
       menu_offset_(menu_offset),
       ALLOW_THIS_IN_INITIALIZER_LIST(controller_(browser, this)) {
   set_id(VIEW_ID_ACTION_BOX_BUTTON);
   SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_ACTION_BOX_BUTTON));
   SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
@@ skipping 13 matching lines @@
 void ActionBoxButtonView::GetAccessibleState(ui::AccessibleViewState* state) {
   MenuButton::GetAccessibleState(state);
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ACTION_BOX_BUTTON);
 }
 
 void ActionBoxButtonView::OnMenuButtonClicked(View* source,
                                               const gfx::Point& point) {
   controller_.OnButtonClicked();
 }
 
+bool ActionBoxButtonView::HasHitTestMask() const {
+  return true;
+}
+
+void ActionBoxButtonView::GetHitTestMask(gfx::Path* mask) const {
+  SkRect clickable_rect;
+  clickable_rect.iset(0, kTopBorderOverlapThickness, width(),
+      height() - kBottomBorderOverlapThickness);
+  mask->addRect(clickable_rect);
+}
+
 void ActionBoxButtonView::ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model) {
   menu_ = ActionBoxMenu::Create(browser_, menu_model.Pass());
   menu_->RunMenu(this, menu_offset_);
 }