diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 00:30:59 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 00:30:59 +0000 |
| commit | a47d6effd9e5a44cf5bfccf5e7e684b6960a3734 (patch) | |
| tree | 8b7c7997a0300195f13ef6809cde8692c9fcfb7a /ash/shell/widgets.cc | |
| parent | 94af172410caa0abf9449dbf169fbb9cfd7ca2ed (diff) | |
| download | chromium_src-a47d6effd9e5a44cf5bfccf5e7e684b6960a3734.zip chromium_src-a47d6effd9e5a44cf5bfccf5e7e684b6960a3734.tar.gz chromium_src-a47d6effd9e5a44cf5bfccf5e7e684b6960a3734.tar.bz2 | |
views: Migrate ash_shell buttons to LabelButton
BUG=155363
R=msw@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12390049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/widgets.cc')
| -rw-r--r-- | ash/shell/widgets.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ash/shell/widgets.cc b/ash/shell/widgets.cc index e83a603..234e5e3 100644 --- a/ash/shell/widgets.cc +++ b/ash/shell/widgets.cc @@ -8,8 +8,8 @@ #include "ui/aura/window.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/checkbox.h" +#include "ui/views/controls/button/label_button.h" #include "ui/views/controls/button/radio_button.h" -#include "ui/views/controls/button/text_button.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" @@ -40,8 +40,8 @@ class WidgetsWindow : public views::WidgetDelegateView { virtual bool CanResize() const OVERRIDE; private: - views::NativeTextButton* button_; - views::NativeTextButton* disabled_button_; + views::LabelButton* button_; + views::LabelButton* disabled_button_; views::Checkbox* checkbox_; views::Checkbox* checkbox_disabled_; views::Checkbox* checkbox_checked_; @@ -53,9 +53,9 @@ class WidgetsWindow : public views::WidgetDelegateView { }; WidgetsWindow::WidgetsWindow() - : button_(new views::NativeTextButton(NULL, ASCIIToUTF16("Button"))), + : button_(new views::LabelButton(NULL, ASCIIToUTF16("Button"))), disabled_button_( - new views::NativeTextButton(NULL, ASCIIToUTF16("Disabled button"))), + new views::LabelButton(NULL, ASCIIToUTF16("Disabled button"))), checkbox_(new views::Checkbox(ASCIIToUTF16("Checkbox"))), checkbox_disabled_(new views::Checkbox( ASCIIToUTF16("Checkbox disabled"))), @@ -69,8 +69,10 @@ WidgetsWindow::WidgetsWindow() ASCIIToUTF16("Radio button selected"), 0)), radio_button_selected_disabled_(new views::RadioButton( ASCIIToUTF16("Radio button selected disabled"), 1)) { + button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON); AddChildView(button_); disabled_button_->SetEnabled(false); + disabled_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON); AddChildView(disabled_button_); AddChildView(checkbox_); checkbox_disabled_->SetEnabled(false); |