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

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

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 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ACTION_BOX_BUTTON_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ACTION_BOX_BUTTON_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ACTION_BOX_BUTTON_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ACTION_BOX_BUTTON_VIEW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/ui/toolbar/action_box_button_controller.h" 9 #include "chrome/browser/ui/toolbar/action_box_button_controller.h"
10 #include "ui/views/controls/button/menu_button.h" 10 #include "ui/views/controls/button/menu_button.h"
11 #include "ui/views/controls/button/menu_button_listener.h" 11 #include "ui/views/controls/button/menu_button_listener.h"
12 12
13 class ActionBoxMenu; 13 class ActionBoxMenu;
14 class Browser; 14 class Browser;
15 15
16 // ActionBoxButtonView displays a plus button with associated menu. 16 // ActionBoxButtonView displays a plus button with associated menu.
17 class ActionBoxButtonView : public views::MenuButton, 17 class ActionBoxButtonView : public views::MenuButton,
18 public views::MenuButtonListener, 18 public views::MenuButtonListener,
19 public ActionBoxButtonController::Delegate { 19 public ActionBoxButtonController::Delegate {
20 public: 20 public:
21 ActionBoxButtonView(Browser* browser, const gfx::Point& menu_offset); 21 ActionBoxButtonView(Browser* browser, const gfx::Point& menu_offset);
22 virtual ~ActionBoxButtonView(); 22 virtual ~ActionBoxButtonView();
23 23
24 ActionBoxButtonController* action_box_button_controller() { 24 ActionBoxButtonController* action_box_button_controller() {
25 return &controller_; 25 return &controller_;
26 } 26 }
27 27
28 void SetClickableHeight(int clickable_height) {
Peter Kasting 2012/10/12 20:57:30 This is much worse than the code before. The loca
yefimt 2012/10/12 23:27:34 Done.
29 clickable_height_ = clickable_height;
30 }
31
32 // Thickness of the top transparent area on a button image that overlaps
33 // location bar border.
34 static const int kTopBorderOverlapThickness;
35
28 private: 36 private:
29 // Overridden from views::CustomButton: 37 // Overridden from views::CustomButton:
30 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 38 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
31 39
32 // Overridden from views::MenuButtonListener: 40 // Overridden from views::MenuButtonListener:
33 virtual void OnMenuButtonClicked(View* source, 41 virtual void OnMenuButtonClicked(View* source,
34 const gfx::Point& point) OVERRIDE; 42 const gfx::Point& point) OVERRIDE;
35 43
44 // Overridden from veiws::View:
45 virtual bool HasHitTestMask() const;
46 virtual void GetHitTestMask(gfx::Path* mask) const;
47
36 // Overridden from ActionBoxButtonController::Delegate: 48 // Overridden from ActionBoxButtonController::Delegate:
37 virtual void ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model) OVERRIDE; 49 virtual void ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model) OVERRIDE;
38 50
39 Browser* browser_; 51 Browser* browser_;
40 52
41 gfx::Point menu_offset_; 53 gfx::Point menu_offset_;
42 54
43 ActionBoxButtonController controller_; 55 ActionBoxButtonController controller_;
44 56
45 scoped_ptr<ActionBoxMenu> menu_; 57 scoped_ptr<ActionBoxMenu> menu_;
46 58
59 // Height of the user clickable area of the button.
60 int clickable_height_;
61
47 DISALLOW_COPY_AND_ASSIGN(ActionBoxButtonView); 62 DISALLOW_COPY_AND_ASSIGN(ActionBoxButtonView);
48 }; 63 };
49 64
50 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ACTION_BOX_BUTTON_VIEW_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ACTION_BOX_BUTTON_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698