diff options
author | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 13:42:58 +0000 |
---|---|---|
committer | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 13:42:58 +0000 |
commit | 5da5b8b3d7fa0b5697c404c5e993eaf93b2af157 (patch) | |
tree | a355cc0fa02b32c6095e3839859b7d8cd53c4fc7 /views/controls/button | |
parent | 3bcb6c574262ba68bb25436dc38a50e2b932e207 (diff) | |
download | chromium_src-5da5b8b3d7fa0b5697c404c5e993eaf93b2af157.zip chromium_src-5da5b8b3d7fa0b5697c404c5e993eaf93b2af157.tar.gz chromium_src-5da5b8b3d7fa0b5697c404c5e993eaf93b2af157.tar.bz2 |
Merge 66061 - Adding style notion to the TextButton.
Welcome screen uses different style of buttons.
BUG=chromium-os:8468
TEST=none
Review URL: http://codereview.chromium.org/4402001
TBR=glotov@google.com
Review URL: http://codereview.chromium.org/4995002
git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@66117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
-rw-r--r-- | views/controls/button/menu_button.cc | 2 | ||||
-rw-r--r-- | views/controls/button/menu_button.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index e7f7f1b..1b94359 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -54,7 +54,7 @@ MenuButton::MenuButton(ButtonListener* listener, menu_delegate_(menu_delegate), show_menu_marker_(show_menu_marker), menu_marker_(ResourceBundle::GetSharedInstance().GetBitmapNamed( - IDR_MENU_DROPARROW)), + IDR_MENU_DROPARROW)), destroyed_flag_(NULL) { set_alignment(TextButton::ALIGN_LEFT); } diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h index 72f8fb6..1e78a9c 100644 --- a/views/controls/button/menu_button.h +++ b/views/controls/button/menu_button.h @@ -31,8 +31,7 @@ class MenuButton : public TextButton { // The menu button's class name. static const char kViewClassName[]; - // - // Create a Button + // Create a Button. MenuButton(ButtonListener* listener, const std::wstring& text, ViewMenuDelegate* menu_delegate, @@ -51,7 +50,7 @@ class MenuButton : public TextButton { virtual void Paint(gfx::Canvas* canvas, bool for_drag); // These methods are overriden to implement a simple push button - // behavior + // behavior. virtual bool OnMousePressed(const MouseEvent& e); virtual void OnMouseReleased(const MouseEvent& e, bool canceled); virtual void OnMouseExited(const MouseEvent& event); |