diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 23:25:13 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 23:25:13 +0000 |
| commit | 48c8fa63122510b2c51c6608a93b30e94192e679 (patch) | |
| tree | dc22b80b2f4103d865cbfe47c6f4dc52c8595985 /chrome/views/custom_frame_view.h | |
| parent | 9ea0ea99d3a1140a17712a286414d387eddbe8ac (diff) | |
| download | chromium_src-48c8fa63122510b2c51c6608a93b30e94192e679.zip chromium_src-48c8fa63122510b2c51c6608a93b30e94192e679.tar.gz chromium_src-48c8fa63122510b2c51c6608a93b30e94192e679.tar.bz2 | |
Rework the Button API to be saner in preparation for NativeControl rejiggering.BaseButton->Button, CustomButtonButton->ImageButtonToggleButton->ToggleImageButtonRemoving SetListener (buttons take listener through ctor)Tidy up source files. No functionality changes, just naming and organization.Look at the button classes first, then everything else.
Review URL: http://codereview.chromium.org/46096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/custom_frame_view.h')
| -rw-r--r-- | chrome/views/custom_frame_view.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/views/custom_frame_view.h b/chrome/views/custom_frame_view.h index 2a47c73..2edc3f9 100644 --- a/chrome/views/custom_frame_view.h +++ b/chrome/views/custom_frame_view.h @@ -5,7 +5,7 @@ #ifndef CHROME_VIEWS_CUSTOM_FRAME_VIEW_H_ #define CHROME_VIEWS_CUSTOM_FRAME_VIEW_H_ -#include "chrome/views/button.h" +#include "chrome/views/image_button.h" #include "chrome/views/non_client_view.h" #include "chrome/views/window.h" #include "chrome/views/window_resources.h" @@ -29,7 +29,7 @@ namespace views { // //////////////////////////////////////////////////////////////////////////////// class CustomFrameView : public NonClientFrameView, - public BaseButton::ButtonListener { + public ButtonListener { public: explicit CustomFrameView(Window* frame); virtual ~CustomFrameView(); @@ -49,8 +49,8 @@ class CustomFrameView : public NonClientFrameView, virtual void Layout(); virtual gfx::Size GetPreferredSize(); - // BaseButton::ButtonListener implementation: - virtual void ButtonPressed(BaseButton* sender); + // ButtonListener implementation: + virtual void ButtonPressed(Button* sender); private: // Returns the thickness of the border that makes up the window frame edges. @@ -98,11 +98,11 @@ class CustomFrameView : public NonClientFrameView, gfx::Rect title_bounds_; // Window controls. - Button* close_button_; - Button* restore_button_; - Button* maximize_button_; - Button* minimize_button_; - Button* system_menu_button_; // Uses the window icon if visible. + ImageButton* close_button_; + ImageButton* restore_button_; + ImageButton* maximize_button_; + ImageButton* minimize_button_; + ImageButton* system_menu_button_; // Uses the window icon if visible. bool should_show_minmax_buttons_; // The window that owns this view. |