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

Unified Diff: ash/shell/lock_view.cc

Issue 12390049: views: Migrate ash_shell buttons to LabelButton (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: set style Created 7 years, 10 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 | ash/shell/widgets.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/lock_view.cc
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc
index 16895c6b571ce970b2c6532de7029fb051783b5f..5390ea783c8b1783f41400ce10e95b1054412616 100644
--- a/ash/shell/lock_view.cc
+++ b/ash/shell/lock_view.cc
@@ -11,7 +11,7 @@
#include "ui/aura/window.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font.h"
-#include "ui/views/controls/button/text_button.h"
+#include "ui/views/controls/button/label_button.h"
#include "ui/views/corewm/tooltip_controller.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -25,7 +25,8 @@ class LockView : public views::WidgetDelegateView,
public views::ButtonListener {
public:
LockView() : unlock_button_(ALLOW_THIS_IN_INITIALIZER_LIST(
- new views::NativeTextButton(this, ASCIIToUTF16("Unlock")))) {
+ new views::LabelButton(this, ASCIIToUTF16("Unlock")))) {
+ unlock_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
AddChildView(unlock_button_);
unlock_button_->set_focusable(true);
}
@@ -74,7 +75,7 @@ class LockView : public views::WidgetDelegateView,
}
gfx::Font font_;
- views::NativeTextButton* unlock_button_;
+ views::LabelButton* unlock_button_;
DISALLOW_COPY_AND_ASSIGN(LockView);
};
« no previous file with comments | « no previous file | ash/shell/widgets.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698