| Index: mash/example/window_type_launcher/window_type_launcher.cc
|
| diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc
|
| index 3151f6112b807d27e612017a9846cf95f5949921..011a9b7ab4f0cf4606d53dc151f72941dd91c59e 100644
|
| --- a/mash/example/window_type_launcher/window_type_launcher.cc
|
| +++ b/mash/example/window_type_launcher/window_type_launcher.cc
|
| @@ -103,8 +103,7 @@ class ModalWindow : public views::WidgetDelegateView,
|
| explicit ModalWindow(ui::ModalType modal_type)
|
| : modal_type_(modal_type),
|
| color_(g_colors[g_color_index]),
|
| - open_button_(
|
| - MdTextButton::CreateMdButton(this, base::ASCIIToUTF16("Moar!"))) {
|
| + open_button_(MdTextButton::Create(this, base::ASCIIToUTF16("Moar!"))) {
|
| ++g_color_index %= arraysize(g_colors);
|
| open_button_->SetStyle(views::Button::STYLE_BUTTON);
|
| AddChildView(open_button_);
|
| @@ -231,55 +230,50 @@ class WindowTypeLauncherView : public views::WidgetDelegateView,
|
| : window_type_launcher_(window_type_launcher),
|
| connector_(connector),
|
| create_button_(
|
| - MdTextButton::CreateMdButton(this,
|
| - base::ASCIIToUTF16("Create Window"))),
|
| - always_on_top_button_(MdTextButton::CreateMdButton(
|
| + MdTextButton::Create(this, base::ASCIIToUTF16("Create Window"))),
|
| + always_on_top_button_(MdTextButton::Create(
|
| this,
|
| base::ASCIIToUTF16("Create Always On Top Window"))),
|
| panel_button_(
|
| - MdTextButton::CreateMdButton(this,
|
| - base::ASCIIToUTF16("Create Panel"))),
|
| - create_nonresizable_button_(MdTextButton::CreateMdButton(
|
| + MdTextButton::Create(this, base::ASCIIToUTF16("Create Panel"))),
|
| + create_nonresizable_button_(MdTextButton::Create(
|
| this,
|
| base::ASCIIToUTF16("Create Non-Resizable Window"))),
|
| - bubble_button_(MdTextButton::CreateMdButton(
|
| - this,
|
| - base::ASCIIToUTF16("Create Pointy Bubble"))),
|
| + bubble_button_(
|
| + MdTextButton::Create(this,
|
| + base::ASCIIToUTF16("Create Pointy Bubble"))),
|
| lock_button_(
|
| - MdTextButton::CreateMdButton(this,
|
| - base::ASCIIToUTF16("Lock Screen"))),
|
| + MdTextButton::Create(this, base::ASCIIToUTF16("Lock Screen"))),
|
| logout_button_(
|
| - MdTextButton::CreateMdButton(this, base::ASCIIToUTF16("Log Out"))),
|
| + MdTextButton::Create(this, base::ASCIIToUTF16("Log Out"))),
|
| switch_user_button_(
|
| - MdTextButton::CreateMdButton(this,
|
| - base::ASCIIToUTF16("Switch User"))),
|
| - widgets_button_(MdTextButton::CreateMdButton(
|
| - this,
|
| - base::ASCIIToUTF16("Show Example Widgets"))),
|
| - system_modal_button_(MdTextButton::CreateMdButton(
|
| + MdTextButton::Create(this, base::ASCIIToUTF16("Switch User"))),
|
| + widgets_button_(
|
| + MdTextButton::Create(this,
|
| + base::ASCIIToUTF16("Show Example Widgets"))),
|
| + system_modal_button_(MdTextButton::Create(
|
| this,
|
| base::ASCIIToUTF16("Open System Modal Window"))),
|
| - window_modal_button_(MdTextButton::CreateMdButton(
|
| + window_modal_button_(MdTextButton::Create(
|
| this,
|
| base::ASCIIToUTF16("Open Window Modal Window"))),
|
| - child_modal_button_(MdTextButton::CreateMdButton(
|
| + child_modal_button_(MdTextButton::Create(
|
| this,
|
| base::ASCIIToUTF16("Open Child Modal Window"))),
|
| - transient_button_(MdTextButton::CreateMdButton(
|
| + transient_button_(MdTextButton::Create(
|
| this,
|
| base::ASCIIToUTF16("Open Non-Modal Transient Window"))),
|
| - examples_button_(MdTextButton::CreateMdButton(
|
| + examples_button_(MdTextButton::Create(
|
| this,
|
| base::ASCIIToUTF16("Open Views Examples Window"))),
|
| - show_hide_window_button_(MdTextButton::CreateMdButton(
|
| - this,
|
| - base::ASCIIToUTF16("Show/Hide a Window"))),
|
| - show_web_notification_(MdTextButton::CreateMdButton(
|
| + show_hide_window_button_(
|
| + MdTextButton::Create(this,
|
| + base::ASCIIToUTF16("Show/Hide a Window"))),
|
| + show_web_notification_(MdTextButton::Create(
|
| this,
|
| base::ASCIIToUTF16("Show a web/app notification"))),
|
| jank_button_(
|
| - MdTextButton::CreateMdButton(this,
|
| - base::ASCIIToUTF16("Jank for (s):"))),
|
| + MdTextButton::Create(this, base::ASCIIToUTF16("Jank for (s):"))),
|
| jank_duration_field_(new views::Textfield) {
|
| views::GridLayout* layout = new views::GridLayout(this);
|
| layout->SetInsets(5, 5, 5, 5);
|
|
|