Change buttons in WindowTypeLauncher to MdTextButton

ash/shell/window_type_launcher.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/window_type_launcher.h"
 
 #include <utility>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/common/wm_shell.h"
 #include "ash/content/shell_content_state.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/test/child_modal_window.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification_types.h"
-#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/examples/examples_window_with_content.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/shadow_types.h"
 
 using views::MenuItemView;
 using views::MenuRunner;
 
 namespace ash {
 namespace shell {
 
 namespace {
 
 SkColor g_colors[] = {SK_ColorRED, SK_ColorYELLOW, SK_ColorBLUE, SK_ColorGREEN};
 int g_color_index = 0;
 
 class ModalWindow : public views::WidgetDelegateView,
                     public views::ButtonListener {
  public:
   explicit ModalWindow(ui::ModalType modal_type)
       : modal_type_(modal_type),
         color_(g_colors[g_color_index]),
         open_button_(
-            new views::LabelButton(this, base::ASCIIToUTF16("Moar!"))) {
+            views::MdTextButton::CreateMdButton(this,
+                                                base::ASCIIToUTF16("Moar!"))) {
     ++g_color_index %= arraysize(g_colors);
-    open_button_->SetStyle(views::Button::STYLE_BUTTON);
     AddChildView(open_button_);
   }
   ~ModalWindow() override {}
 
   static void OpenModalWindow(aura::Window* parent, ui::ModalType modal_type) {
     views::Widget* widget = views::Widget::CreateWindowWithParent(
         new ModalWindow(modal_type), parent);
     widget->GetNativeView()->SetName("ModalWindow");
     widget->Show();
   }
@@ skipping 20 matching lines @@
 
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     DCHECK(sender == open_button_);
     OpenModalWindow(GetWidget()->GetNativeView(), modal_type_);
   }
 
  private:
   ui::ModalType modal_type_;
   SkColor color_;
-  views::LabelButton* open_button_;
+  views::Button* open_button_;
 
   DISALLOW_COPY_AND_ASSIGN(ModalWindow);
 };
 
 class NonModalTransient : public views::WidgetDelegateView {
  public:
   NonModalTransient() : color_(g_colors[g_color_index]) {
     ++g_color_index %= arraysize(g_colors);
   }
   ~NonModalTransient() override {}
@@ skipping 58 matching lines @@
 void InitWindowTypeLauncher() {
   views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
       new WindowTypeLauncher, Shell::GetPrimaryRootWindow(),
       gfx::Rect(120, 150, 300, 410));
   widget->GetNativeView()->SetName("WindowTypeLauncher");
   ::wm::SetShadowType(widget->GetNativeView(), ::wm::SHADOW_TYPE_RECTANGULAR);
   widget->Show();
 }
 
 WindowTypeLauncher::WindowTypeLauncher()
-    : create_button_(
-          new views::LabelButton(this, base::ASCIIToUTF16("Create Window"))),
-      panel_button_(
-          new views::LabelButton(this, base::ASCIIToUTF16("Create Panel"))),
-      create_nonresizable_button_(new views::LabelButton(
+    : create_button_(views::MdTextButton::CreateMdButton(

[James Cook, 2016/08/31 22:41:52]

nit: "using views::MdTextButton;" might make this more readable

+          this,
+          base::ASCIIToUTF16("Create Window"))),
+      panel_button_(views::MdTextButton::CreateMdButton(
+          this,
+          base::ASCIIToUTF16("Create Panel"))),
+      create_nonresizable_button_(views::MdTextButton::CreateMdButton(
           this,
           base::ASCIIToUTF16("Create Non-Resizable Window"))),
-      bubble_button_(
-          new views::LabelButton(this,
-                                 base::ASCIIToUTF16("Create Pointy Bubble"))),
-      lock_button_(
-          new views::LabelButton(this, base::ASCIIToUTF16("Lock Screen"))),
-      widgets_button_(
-          new views::LabelButton(this,
-                                 base::ASCIIToUTF16("Show Example Widgets"))),
-      system_modal_button_(new views::LabelButton(
+      bubble_button_(views::MdTextButton::CreateMdButton(
+          this,
+          base::ASCIIToUTF16("Create Pointy Bubble"))),
+      lock_button_(views::MdTextButton::CreateMdButton(
+          this,
+          base::ASCIIToUTF16("Lock Screen"))),
+      widgets_button_(views::MdTextButton::CreateMdButton(
+          this,
+          base::ASCIIToUTF16("Show Example Widgets"))),
+      system_modal_button_(views::MdTextButton::CreateMdButton(
           this,
           base::ASCIIToUTF16("Open System Modal Window"))),
-      window_modal_button_(new views::LabelButton(
+      window_modal_button_(views::MdTextButton::CreateMdButton(
           this,
           base::ASCIIToUTF16("Open Window Modal Window"))),
-      child_modal_button_(new views::LabelButton(
+      child_modal_button_(views::MdTextButton::CreateMdButton(
           this,
           base::ASCIIToUTF16("Open Child Modal Window"))),
-      transient_button_(new views::LabelButton(
+      transient_button_(views::MdTextButton::CreateMdButton(
           this,
           base::ASCIIToUTF16("Open Non-Modal Transient Window"))),
-      examples_button_(new views::LabelButton(
+      examples_button_(views::MdTextButton::CreateMdButton(
           this,
           base::ASCIIToUTF16("Open Views Examples Window"))),
-      show_hide_window_button_(
-          new views::LabelButton(this,
-                                 base::ASCIIToUTF16("Show/Hide a Window"))),
-      show_web_notification_(new views::LabelButton(
+      show_hide_window_button_(views::MdTextButton::CreateMdButton(
+          this,
+          base::ASCIIToUTF16("Show/Hide a Window"))),
+      show_web_notification_(views::MdTextButton::CreateMdButton(
           this,
           base::ASCIIToUTF16("Show a web/app notification"))) {
-  create_button_->SetStyle(views::Button::STYLE_BUTTON);
-  panel_button_->SetStyle(views::Button::STYLE_BUTTON);
-  create_nonresizable_button_->SetStyle(views::Button::STYLE_BUTTON);
-  bubble_button_->SetStyle(views::Button::STYLE_BUTTON);
-  lock_button_->SetStyle(views::Button::STYLE_BUTTON);
-  widgets_button_->SetStyle(views::Button::STYLE_BUTTON);
-  system_modal_button_->SetStyle(views::Button::STYLE_BUTTON);
-  window_modal_button_->SetStyle(views::Button::STYLE_BUTTON);
-  child_modal_button_->SetStyle(views::Button::STYLE_BUTTON);
-  transient_button_->SetStyle(views::Button::STYLE_BUTTON);
-  examples_button_->SetStyle(views::Button::STYLE_BUTTON);
-  show_hide_window_button_->SetStyle(views::Button::STYLE_BUTTON);
-  show_web_notification_->SetStyle(views::Button::STYLE_BUTTON);
-
   views::GridLayout* layout = new views::GridLayout(this);
   layout->SetInsets(5, 5, 5, 5);
   SetLayoutManager(layout);
   views::ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                         0, views::GridLayout::USE_PREF, 0, 0);
   AddViewToLayout(layout, create_button_);
   AddViewToLayout(layout, panel_button_);
   AddViewToLayout(layout, create_nonresizable_button_);
   AddViewToLayout(layout, bubble_button_);
@@ skipping 122 matching lines @@
                                               views::MenuRunner::ASYNC));
   if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
                               views::MENU_ANCHOR_TOPLEFT,
                               source_type) == MenuRunner::MENU_DELETED) {
     return;
   }
 }
 
 }  // namespace shell
 }  // namespace ash