Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 static const int kTopBorderOverlapThickness; | |
| 29 static const int kBottomBorderOverlapThickness; | |
|
Peter Kasting
2012/10/12 00:32:15
Nit: At least this second const doesn't need to be
yefimt
2012/10/12 20:09:38
Removed second static area and made clickable heig
| |
| 30 | |
| 28 private: | 31 private: |
| 29 // Overridden from views::CustomButton: | 32 // Overridden from views::CustomButton: |
| 30 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; | 33 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |
| 31 | 34 |
| 32 // Overridden from views::MenuButtonListener: | 35 // Overridden from views::MenuButtonListener: |
| 33 virtual void OnMenuButtonClicked(View* source, | 36 virtual void OnMenuButtonClicked(View* source, |
| 34 const gfx::Point& point) OVERRIDE; | 37 const gfx::Point& point) OVERRIDE; |
| 35 | 38 |
| 39 // Overridden from veiws::View: | |
| 40 virtual bool HasHitTestMask() const; | |
| 41 virtual void GetHitTestMask(gfx::Path* mask) const; | |
| 42 | |
| 36 // Overridden from ActionBoxButtonController::Delegate: | 43 // Overridden from ActionBoxButtonController::Delegate: |
| 37 virtual void ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model) OVERRIDE; | 44 virtual void ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model) OVERRIDE; |
| 38 | 45 |
| 39 Browser* browser_; | 46 Browser* browser_; |
| 40 | 47 |
| 41 gfx::Point menu_offset_; | 48 gfx::Point menu_offset_; |
| 42 | 49 |
| 43 ActionBoxButtonController controller_; | 50 ActionBoxButtonController controller_; |
| 44 | 51 |
| 45 scoped_ptr<ActionBoxMenu> menu_; | 52 scoped_ptr<ActionBoxMenu> menu_; |
| 46 | 53 |
| 47 DISALLOW_COPY_AND_ASSIGN(ActionBoxButtonView); | 54 DISALLOW_COPY_AND_ASSIGN(ActionBoxButtonView); |
| 48 }; | 55 }; |
| 49 | 56 |
| 50 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ACTION_BOX_BUTTON_VIEW_H_ | 57 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ACTION_BOX_BUTTON_VIEW_H_ |
| OLD | NEW |