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

Unified Diff: mash/screenlock/screenlock.cc

Issue 2357363002: Update a few STYLE_BUTTON buttons in mash. (Closed)
Patch Set: qualify with namespace Created 4 years, 3 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 | « mash/login/login.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/screenlock/screenlock.cc
diff --git a/mash/screenlock/screenlock.cc b/mash/screenlock/screenlock.cc
index 49cc8bbd4867c485d7c0c2541d6e7156597e1b8d..96ad20d9b5ff4957897c88a1494378a74dc44fa8 100644
--- a/mash/screenlock/screenlock.cc
+++ b/mash/screenlock/screenlock.cc
@@ -12,7 +12,7 @@
#include "services/shell/public/cpp/connector.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "ui/views/background.h"
-#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/button/md_text_button.h"
#include "ui/views/mus/aura_init.h"
#include "ui/views/mus/native_widget_mus.h"
#include "ui/views/mus/window_manager_connection.h"
@@ -28,9 +28,8 @@ class ScreenlockView : public views::WidgetDelegateView,
explicit ScreenlockView(shell::Connector* connector)
: connector_(connector),
unlock_button_(
- new views::LabelButton(this, base::ASCIIToUTF16("Unlock"))) {
+ views::MdTextButton::Create(this, base::ASCIIToUTF16("Unlock"))) {
set_background(views::Background::CreateSolidBackground(SK_ColorYELLOW));
- unlock_button_->SetStyle(views::Button::STYLE_BUTTON);
AddChildView(unlock_button_);
}
~ScreenlockView() override {}
@@ -65,7 +64,7 @@ class ScreenlockView : public views::WidgetDelegateView,
}
shell::Connector* connector_;
- views::LabelButton* unlock_button_;
+ views::MdTextButton* unlock_button_;
DISALLOW_COPY_AND_ASSIGN(ScreenlockView);
};
« no previous file with comments | « mash/login/login.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698