Update a few STYLE_BUTTON buttons in mash.

mash/login/login.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mash/login/login.h"
 
 #include <map>
 #include <memory>
 
 #include "ash/public/interfaces/container.mojom.h"
 #include "base/guid.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mash/init/public/interfaces/init.mojom.h"
 #include "mash/login/public/interfaces/login.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/tracing/public/cpp/provider.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/user_access_manager.mojom.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"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mash {
 namespace login {
 namespace {
 
 class Login;
@@ skipping 24 matching lines @@
     widget->Show();
   }
 
  private:
   UI(Login* login, shell::Connector* connector)
       : login_(login),
         connector_(connector),
         user_id_1_("00000000-0000-4000-8000-000000000000"),
         user_id_2_("00000000-0000-4000-8000-000000000001"),
         login_button_1_(
-            new views::LabelButton(this, base::ASCIIToUTF16("Timothy"))),
+            views::MdTextButton::Create(this, base::ASCIIToUTF16("Timothy"))),
         login_button_2_(
-            new views::LabelButton(this, base::ASCIIToUTF16("Jimothy"))) {
+            views::MdTextButton::Create(this, base::ASCIIToUTF16("Jimothy"))) {
     set_background(views::Background::CreateSolidBackground(SK_ColorRED));
-    login_button_1_->SetStyle(views::Button::STYLE_BUTTON);
-    login_button_2_->SetStyle(views::Button::STYLE_BUTTON);
     AddChildView(login_button_1_);
     AddChildView(login_button_2_);
   }
   ~UI() override {
     // Prevent the window manager from restarting during graceful shutdown.
     mash_wm_connection_->SetConnectionLostClosure(base::Closure());
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   // Overridden from views::WidgetDelegate:
@@ skipping 12 matching lines @@
     gfx::Size ps1 = login_button_1_->GetPreferredSize();
     gfx::Size ps2 = login_button_2_->GetPreferredSize();
 
     DCHECK(ps1.height() == ps2.height());
 
     // The 10 is inter-button spacing.
     button_box.set_x((button_box.width() - ps1.width() - ps2.width() - 10) / 2);
     button_box.set_y((button_box.height() - ps1.height()) / 2);
 
     login_button_1_->SetBounds(button_box.x(), button_box.y(), ps1.width(),
-                                ps1.height());
+                               ps1.height());
     login_button_2_->SetBounds(login_button_1_->bounds().right() + 10,
-                                button_box.y(), ps2.width(), ps2.height());
+                               button_box.y(), ps2.width(), ps2.height());
   }
 
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   void StartWindowManager(const shell::Identity& identity) {
     mash_wm_connection_ = connector_->Connect("mojo:ash");
     mash_wm_connection_->SetConnectionLostClosure(
         base::Bind(&UI::StartWindowManager, base::Unretained(this), identity));
     window_manager_connection_ =
         views::WindowManagerConnection::Create(connector_, identity);
   }
 
   Login* login_;
   shell::Connector* connector_;
   const std::string user_id_1_;
   const std::string user_id_2_;
-  views::LabelButton* login_button_1_;
-  views::LabelButton* login_button_2_;
+  views::MdTextButton* login_button_1_;
+  views::MdTextButton* login_button_2_;
   std::unique_ptr<shell::Connection> mash_wm_connection_;
   std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(UI);
 };
 
 class Login : public shell::Service,
               public shell::InterfaceFactory<mojom::Login>,
               public mojom::Login {
  public:
@@ skipping 63 matching lines @@
 }
 
 }  // namespace
 
 shell::Service* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main