views: Migrate ash_shell buttons to LabelButton

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 "ash/root_window_controller.h"
 #include "ash/screensaver/screensaver_view.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/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "base/bind.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/message_center/notification_types.h"
-#include "ui/views/controls/button/text_button.h"
+#include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/corewm/shadow_types.h"
 #include "ui/views/examples/examples_window_with_content.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/child_modal_window.h"
 #include "ui/views/widget/widget.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]),
         ALLOW_THIS_IN_INITIALIZER_LIST(open_button_(
-            new views::NativeTextButton(this, ASCIIToUTF16("Moar!")))) {
+            new views::LabelButton(this, ASCIIToUTF16("Moar!")))) {

[msw, 2013/03/03 04:38:36]

You need to set the native style on this button.

[tfarina, 2013/03/03 21:38:26]

Done.

     ++g_color_index %= arraysize(g_colors);
     AddChildView(open_button_);
   }
   virtual ~ModalWindow() {
   }
 
   static void OpenModalWindow(aura::Window* parent, ui::ModalType modal_type) {
     views::Widget* widget =
         views::Widget::CreateWindowWithParent(new ModalWindow(modal_type),
                                               parent);
@@ skipping 33 matching lines @@
   // Overridden from views::ButtonListener:
   virtual 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::NativeTextButton* open_button_;
+  views::LabelButton* 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);
   }
@@ skipping 70 matching lines @@
           Shell::GetPrimaryRootWindow(),
           gfx::Rect(120, 150, 300, 410));
   widget->GetNativeView()->SetName("WindowTypeLauncher");
   views::corewm::SetShadowType(widget->GetNativeView(),
                                views::corewm::SHADOW_TYPE_RECTANGULAR);
   widget->Show();
 }
 
 WindowTypeLauncher::WindowTypeLauncher()
     : ALLOW_THIS_IN_INITIALIZER_LIST(create_button_(
-          new views::NativeTextButton(this, ASCIIToUTF16("Create Window")))),
+          new views::LabelButton(this, ASCIIToUTF16("Create Window")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(create_persistant_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Create Persistant Window")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(panel_button_(
-          new views::NativeTextButton(this, ASCIIToUTF16("Create Panel")))),
+          new views::LabelButton(this, ASCIIToUTF16("Create Panel")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(create_nonresizable_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Create Non-Resizable Window")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(bubble_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Create Pointy Bubble")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(lock_button_(
-          new views::NativeTextButton(this, ASCIIToUTF16("Lock Screen")))),
+          new views::LabelButton(this, ASCIIToUTF16("Lock Screen")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(widgets_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Show Example Widgets")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(system_modal_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Open System Modal Window")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(window_modal_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Open Window Modal Window")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(child_modal_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Open Child Modal Window")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(transient_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Open Non-Modal Transient Window")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(examples_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Open Views Examples Window")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(show_hide_window_button_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Show/Hide a Window")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(show_screensaver_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Show the Screensaver [for 5 seconds]")))),
       ALLOW_THIS_IN_INITIALIZER_LIST(show_web_notification_(
-          new views::NativeTextButton(
+          new views::LabelButton(
               this, ASCIIToUTF16("Show a web/app notification")))) {
+  create_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  create_persistant_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  panel_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  create_nonresizable_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  bubble_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  lock_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  widgets_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  system_modal_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  window_modal_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  child_modal_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  transient_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  examples_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  show_hide_window_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  show_screensaver_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+  show_web_notification_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+
   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);
@@ skipping 138 matching lines @@
   if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
         MenuItemView::TOPLEFT,
         MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
         MenuRunner::MENU_DELETED)
     return;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace shell
 }  // namespace ash