diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 23:00:22 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 23:00:22 +0000 |
| commit | ca607835220dbfa2842c7667e63fcb243960951d (patch) | |
| tree | 6e91b7bede1ed22242ffe7b599d9f05a01ac8f7c /views | |
| parent | cc21fb5b4e675a86c8862b934aa8e100643e75e4 (diff) | |
| download | chromium_src-ca607835220dbfa2842c7667e63fcb243960951d.zip chromium_src-ca607835220dbfa2842c7667e63fcb243960951d.tar.gz chromium_src-ca607835220dbfa2842c7667e63fcb243960951d.tar.bz2 | |
Some more porting of browser_views.
Review URL: http://codereview.chromium.org/113794
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/button/menu_button.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h index c9a39dd..e17f65d 100644 --- a/views/controls/button/menu_button.h +++ b/views/controls/button/menu_button.h @@ -5,8 +5,6 @@ #ifndef VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ #define VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ -#include <windows.h> - #include "app/gfx/font.h" #include "base/time.h" #include "views/background.h" @@ -59,17 +57,16 @@ class MenuButton : public TextButton { virtual bool GetAccessibleState(AccessibilityTypes::State* state); protected: - // true if the menu is currently visible. + // True if the menu is currently visible. bool menu_visible_; private: + friend class TextButtonBackground; // Compute the maximum X coordinate for the current screen. MenuButtons // use this to make sure a menu is never shown off screen. int GetMaximumScreenXCoordinate(); - DISALLOW_EVIL_CONSTRUCTORS(MenuButton); - // We use a time object in order to keep track of when the menu was closed. // The time is used for simulating menu behavior for the menu button; that // is, if the menu is shown and the button is pressed, we need to close the @@ -84,7 +81,7 @@ class MenuButton : public TextButton { // Whether or not we're showing a drop marker. bool show_menu_marker_; - friend class TextButtonBackground; + DISALLOW_COPY_AND_ASSIGN(MenuButton); }; } // namespace views |