Remove some more LabelButton::STYLE_BUTTON references.

ash/shell/widgets.cc

 // Copyright (c) 2012 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 "ash/shell.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.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/md_text_button.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
 // Default window position.
 const int kWindowLeft = 170;
 const int kWindowTop = 200;
 
@@ skipping 24 matching lines @@
   views::Checkbox* checkbox_disabled_;
   views::Checkbox* checkbox_checked_;
   views::Checkbox* checkbox_checked_disabled_;
   views::RadioButton* radio_button_;
   views::RadioButton* radio_button_disabled_;
   views::RadioButton* radio_button_selected_;
   views::RadioButton* radio_button_selected_disabled_;
 };
 
 WidgetsWindow::WidgetsWindow()
-    : button_(new views::LabelButton(NULL, base::ASCIIToUTF16("Button"))),
-      disabled_button_(
-          new views::LabelButton(NULL, base::ASCIIToUTF16("Disabled button"))),
+    : button_(
+          views::MdTextButton::CreateMdButton(NULL,
+                                              base::ASCIIToUTF16("Button"))),
+      disabled_button_(views::MdTextButton::CreateMdButton(
+          NULL,

[James Cook, 2016/09/01 02:35:57]

nit: nullptr since you're touching the lines anyway

[Evan Stade, 2016/09/01 20:02:44]

Done.

+          base::ASCIIToUTF16("Disabled button"))),
       checkbox_(new views::Checkbox(base::ASCIIToUTF16("Checkbox"))),
       checkbox_disabled_(
           new views::Checkbox(base::ASCIIToUTF16("Checkbox disabled"))),
       checkbox_checked_(
           new views::Checkbox(base::ASCIIToUTF16("Checkbox checked"))),
       checkbox_checked_disabled_(
           new views::Checkbox(base::ASCIIToUTF16("Checkbox checked disabled"))),
       radio_button_(
           new views::RadioButton(base::ASCIIToUTF16("Radio button"), 0)),
       radio_button_disabled_(
           new views::RadioButton(base::ASCIIToUTF16("Radio button disabled"),
                                  0)),
       radio_button_selected_(
           new views::RadioButton(base::ASCIIToUTF16("Radio button selected"),
                                  0)),
       radio_button_selected_disabled_(new views::RadioButton(
           base::ASCIIToUTF16("Radio button selected disabled"),
           1)) {
-  button_->SetStyle(views::Button::STYLE_BUTTON);
   AddChildView(button_);
   disabled_button_->SetEnabled(false);
-  disabled_button_->SetStyle(views::Button::STYLE_BUTTON);
   AddChildView(disabled_button_);
   AddChildView(checkbox_);
   checkbox_disabled_->SetEnabled(false);
   AddChildView(checkbox_disabled_);
   checkbox_checked_->SetChecked(true);
   AddChildView(checkbox_checked_);
   checkbox_checked_disabled_->SetChecked(true);
   checkbox_checked_disabled_->SetEnabled(false);
   AddChildView(checkbox_checked_disabled_);
   AddChildView(radio_button_);
@@ skipping 48 matching lines @@
 void CreateWidgetsWindow() {
   gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight);
   views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
       new WidgetsWindow, Shell::GetPrimaryRootWindow(), bounds);
   widget->GetNativeView()->SetName("WidgetsWindow");
   widget->Show();
 }
 
 }  // namespace shell
 }  // namespace ash