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

Unified Diff: ui/views/controls/button/image_button.h

Issue 10207031: views: Fix var names of ToggleImageButton::SetImage() function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/image_button.h
diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h
index 3085869f3712e8b532dff7c5351038070d517255..ed0c80e0f0b3007615a9000bd35a810a4058b590 100644
--- a/ui/views/controls/button/image_button.h
+++ b/ui/views/controls/button/image_button.h
@@ -20,6 +20,18 @@ namespace views {
class VIEWS_EXPORT ImageButton : public CustomButton {
public:
+ enum HorizontalAlignment {
+ ALIGN_LEFT = 0,
+ ALIGN_CENTER,
+ ALIGN_RIGHT
+ };
+
+ enum VerticalAlignment {
+ ALIGN_TOP = 0,
+ ALIGN_MIDDLE,
+ ALIGN_BOTTOM
+ };
+
explicit ImageButton(ButtonListener* listener);
virtual ~ImageButton();
@@ -35,14 +47,6 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
// Pass NULL for no image.
void SetOverlayImage(const SkBitmap* image);
- enum HorizontalAlignment { ALIGN_LEFT = 0,
- ALIGN_CENTER,
- ALIGN_RIGHT, };
-
- enum VerticalAlignment { ALIGN_TOP = 0,
- ALIGN_MIDDLE,
- ALIGN_BOTTOM };
-
// Sets how the image is laid out within the button's bounds.
void SetImageAlignment(HorizontalAlignment h_align,
VerticalAlignment v_align);
@@ -106,7 +110,7 @@ class VIEWS_EXPORT ToggleImageButton : public ImageButton {
void SetToggledTooltipText(const string16& tooltip);
// Overridden from ImageButton:
- virtual void SetImage(ButtonState aState, const SkBitmap* anImage) OVERRIDE;
+ virtual void SetImage(ButtonState state, const SkBitmap* image) OVERRIDE;
// Overridden from View:
virtual bool GetTooltipText(const gfx::Point& p,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698