Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Side by Side Diff: chrome/browser/ui/views/location_bar/action_box_button_view.cc

Issue 11095008: New action box button images and supporting code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/location_bar/action_box_button_view.h" 5 #include "chrome/browser/ui/views/location_bar/action_box_button_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/toolbar/action_box_menu_model.h" 9 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"
10 #include "chrome/browser/ui/view_ids.h" 10 #include "chrome/browser/ui/view_ids.h"
11 #include "chrome/browser/ui/views/action_box_menu.h" 11 #include "chrome/browser/ui/views/action_box_menu.h"
12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "grit/theme_resources.h" 14 #include "grit/theme_resources.h"
15 #include "ui/base/accessibility/accessible_view_state.h" 15 #include "ui/base/accessibility/accessible_view_state.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/gfx/path.h"
19
20 // static
21 const int ActionBoxButtonView::kBorderOverlap = 2;
18 22
19 ActionBoxButtonView::ActionBoxButtonView(Browser* browser, 23 ActionBoxButtonView::ActionBoxButtonView(Browser* browser,
20 const gfx::Point& menu_offset) 24 const gfx::Point& menu_offset)
21 : views::MenuButton(NULL, string16(), this, false), 25 : views::MenuButton(NULL, string16(), this, false),
22 browser_(browser), 26 browser_(browser),
23 menu_offset_(menu_offset), 27 menu_offset_(menu_offset),
24 ALLOW_THIS_IN_INITIALIZER_LIST(controller_(browser, this)) { 28 ALLOW_THIS_IN_INITIALIZER_LIST(controller_(browser, this)) {
25 set_id(VIEW_ID_ACTION_BOX_BUTTON); 29 set_id(VIEW_ID_ACTION_BOX_BUTTON);
26 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_ACTION_BOX_BUTTON)); 30 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_ACTION_BOX_BUTTON));
27 SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 31 SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
(...skipping 13 matching lines...) Expand all
41 void ActionBoxButtonView::GetAccessibleState(ui::AccessibleViewState* state) { 45 void ActionBoxButtonView::GetAccessibleState(ui::AccessibleViewState* state) {
42 MenuButton::GetAccessibleState(state); 46 MenuButton::GetAccessibleState(state);
43 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ACTION_BOX_BUTTON); 47 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ACTION_BOX_BUTTON);
44 } 48 }
45 49
46 void ActionBoxButtonView::OnMenuButtonClicked(View* source, 50 void ActionBoxButtonView::OnMenuButtonClicked(View* source,
47 const gfx::Point& point) { 51 const gfx::Point& point) {
48 controller_.OnButtonClicked(); 52 controller_.OnButtonClicked();
49 } 53 }
50 54
55 bool ActionBoxButtonView::HasHitTestMask() const {
56 return true;
57 }
58
59 void ActionBoxButtonView::GetHitTestMask(gfx::Path* mask) const {
60 SkRect clickable_rect;
61 clickable_rect.iset(0, kBorderOverlap, width(), height() - kBorderOverlap);
62 mask->addRect(clickable_rect);
63 }
64
51 void ActionBoxButtonView::ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model) { 65 void ActionBoxButtonView::ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model) {
52 menu_ = ActionBoxMenu::Create(browser_, menu_model.Pass()); 66 menu_ = ActionBoxMenu::Create(browser_, menu_model.Pass());
53 menu_->RunMenu(this, menu_offset_); 67 menu_->RunMenu(this, menu_offset_);
54 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698