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

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

Issue 10905296: Adjusted action box menu position relative to omnibox and action box menu button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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"
(...skipping 10 matching lines...) Expand all
21 // Colors used for button backgrounds and border. 21 // Colors used for button backgrounds and border.
22 const SkColor kHotBackgroundColor = SkColorSetRGB(239, 239, 239); 22 const SkColor kHotBackgroundColor = SkColorSetRGB(239, 239, 239);
23 const SkColor kPushedBackgroundColor = SkColorSetRGB(207, 207, 207); 23 const SkColor kPushedBackgroundColor = SkColorSetRGB(207, 207, 207);
24 24
25 const SkColor kHotBorderColor = SkColorSetRGB(223, 223, 223); 25 const SkColor kHotBorderColor = SkColorSetRGB(223, 223, 223);
26 const SkColor kPushedBorderColor = SkColorSetRGB(191, 191, 191); 26 const SkColor kPushedBorderColor = SkColorSetRGB(191, 191, 191);
27 27
28 } // namespace 28 } // namespace
29 29
30 30
31 ActionBoxButtonView::ActionBoxButtonView(Browser* browser) 31 ActionBoxButtonView::ActionBoxButtonView(Browser* browser,
32 const gfx::Point& menu_offset)
32 : views::MenuButton(NULL, string16(), this, false), 33 : views::MenuButton(NULL, string16(), this, false),
33 browser_(browser) { 34 browser_(browser),
35 menu_offset_(menu_offset) {
34 set_id(VIEW_ID_ACTION_BOX_BUTTON); 36 set_id(VIEW_ID_ACTION_BOX_BUTTON);
35 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_ACTION_BOX_BUTTON)); 37 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_ACTION_BOX_BUTTON));
36 SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 38 SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
37 IDR_ACTION_BOX_BUTTON)); 39 IDR_ACTION_BOX_BUTTON));
38 set_accessibility_focusable(true); 40 set_accessibility_focusable(true);
39 set_border(NULL); 41 set_border(NULL);
40 } 42 }
41 43
42 ActionBoxButtonView::~ActionBoxButtonView() { 44 ActionBoxButtonView::~ActionBoxButtonView() {
43 } 45 }
(...skipping 24 matching lines...) Expand all
68 void ActionBoxButtonView::GetAccessibleState(ui::AccessibleViewState* state) { 70 void ActionBoxButtonView::GetAccessibleState(ui::AccessibleViewState* state) {
69 MenuButton::GetAccessibleState(state); 71 MenuButton::GetAccessibleState(state);
70 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ACTION_BOX_BUTTON); 72 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ACTION_BOX_BUTTON);
71 } 73 }
72 74
73 void ActionBoxButtonView::OnMenuButtonClicked(View* source, 75 void ActionBoxButtonView::OnMenuButtonClicked(View* source,
74 const gfx::Point& point) { 76 const gfx::Point& point) {
75 ActionBoxMenuModel model(browser_); 77 ActionBoxMenuModel model(browser_);
76 ActionBoxMenu action_box_menu(browser_, &model); 78 ActionBoxMenu action_box_menu(browser_, &model);
77 action_box_menu.Init(); 79 action_box_menu.Init();
78 action_box_menu.RunMenu(this); 80 action_box_menu.RunMenu(this, menu_offset_);
79 } 81 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698