Rename views::MdTextButton::CreateMdButton to just Create

BUG=none
TBR=peter@chromium.org

Review-Url: https://codereview.chromium.org/2313253003
Cr-Commit-Position: refs/heads/master@{#417075}

ash/common/system/chromeos/session/logout_button_tray.cc

@@ -107,7 +107,7 @@ LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)
       show_logout_button_in_tray_(false) {
   if (MaterialDesignController::IsShelfMaterial()) {
     views::MdTextButton* button =
-        views::MdTextButton::CreateMdButton(this, base::string16());
+        views::MdTextButton::Create(this, base::string16());
     button->SetCallToAction(true);
     button->set_bg_color_override(gfx::kGoogleRed700);
     // Base font size + 2 = 14.

ash/shell/lock_view.cc

@@ -27,8 +27,7 @@ class LockView : public views::WidgetDelegateView,
  public:
   LockView()
       : unlock_button_(
-            views::MdTextButton::CreateMdButton(this,
-                                                base::ASCIIToUTF16("Unlock"))) {
+            views::MdTextButton::Create(this, base::ASCIIToUTF16("Unlock"))) {
     AddChildView(unlock_button_);
   }
   ~LockView() override {}

ash/shell/widgets.cc

@@ -54,11 +54,10 @@ class WidgetsWindow : public views::WidgetDelegateView {
 
 WidgetsWindow::WidgetsWindow()
     : button_(
-          views::MdTextButton::CreateMdButton(nullptr,
-                                              base::ASCIIToUTF16("Button"))),
-      disabled_button_(views::MdTextButton::CreateMdButton(
-          nullptr,
-          base::ASCIIToUTF16("Disabled button"))),
+          views::MdTextButton::Create(nullptr, base::ASCIIToUTF16("Button"))),
+      disabled_button_(
+          views::MdTextButton::Create(nullptr,
+                                      base::ASCIIToUTF16("Disabled button"))),
       checkbox_(new views::Checkbox(base::ASCIIToUTF16("Checkbox"))),
       checkbox_disabled_(
           new views::Checkbox(base::ASCIIToUTF16("Checkbox disabled"))),

ash/shell/window_type_launcher.cc

@@ -51,8 +51,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);
     AddChildView(open_button_);
   }
@@ -174,42 +173,38 @@ void InitWindowTypeLauncher() {
 
 WindowTypeLauncher::WindowTypeLauncher()
     : create_button_(
-          MdTextButton::CreateMdButton(this,
-                                       base::ASCIIToUTF16("Create Window"))),
+          MdTextButton::Create(this, base::ASCIIToUTF16("Create 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"))),
-      widgets_button_(MdTextButton::CreateMdButton(
-          this,
-          base::ASCIIToUTF16("Show Example Widgets"))),
-      system_modal_button_(MdTextButton::CreateMdButton(
-          this,
-          base::ASCIIToUTF16("Open System Modal Window"))),
-      window_modal_button_(MdTextButton::CreateMdButton(
-          this,
-          base::ASCIIToUTF16("Open Window Modal Window"))),
-      child_modal_button_(MdTextButton::CreateMdButton(
-          this,
-          base::ASCIIToUTF16("Open Child Modal Window"))),
-      transient_button_(MdTextButton::CreateMdButton(
+          MdTextButton::Create(this, base::ASCIIToUTF16("Lock Screen"))),
+      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::Create(this,
+                               base::ASCIIToUTF16("Open Window Modal Window"))),
+      child_modal_button_(
+          MdTextButton::Create(this,
+                               base::ASCIIToUTF16("Open Child Modal Window"))),
+      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"))) {
   views::GridLayout* layout = new views::GridLayout(this);

chrome/browser/ui/views/download/download_item_view_md.cc

@@ -958,11 +958,11 @@ void DownloadItemViewMd::ShowWarningDialog() {
 
   dropdown_state_ = NORMAL;
   if (mode_ == DANGEROUS_MODE) {
-    save_button_ = views::MdTextButton::CreateMdButton(
-        this, model_.GetWarningConfirmButtonText());
+    save_button_ =
+        views::MdTextButton::Create(this, model_.GetWarningConfirmButtonText());
     AddChildView(save_button_);
   }
-  discard_button_ = views::MdTextButton::CreateMdButton(
+  discard_button_ = views::MdTextButton::Create(
       this, l10n_util::GetStringUTF16(IDS_DISCARD_DOWNLOAD));
   AddChildView(discard_button_);
 

chrome/browser/ui/views/download/download_shelf_view.cc

@@ -168,7 +168,7 @@ DownloadShelfView::DownloadShelfView(Browser* browser, BrowserView* parent)
     close_button_->SetImage(views::CustomButton::STATE_PRESSED,
                             rb.GetImageSkiaNamed(IDR_CLOSE_1_P));
   } else {
-    show_all_view_md_ = views::MdTextButton::CreateMdButton(
+    show_all_view_md_ = views::MdTextButton::Create(
         this, l10n_util::GetStringUTF16(IDS_SHOW_ALL_DOWNLOADS_MD));
     show_all_view_ = show_all_view_md_;
 

chrome/browser/ui/views/infobars/confirm_infobar.cc

@@ -73,7 +73,7 @@ void ConfirmInfoBar::ViewHierarchyChanged(
 
     if (delegate->GetButtons() & ConfirmInfoBarDelegate::BUTTON_OK) {
       if (ui::MaterialDesignController::IsModeMaterial()) {
-        views::MdTextButton* button = views::MdTextButton::CreateMdButton(
+        views::MdTextButton* button = views::MdTextButton::Create(
             this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
         button->SetCallToAction(true);
         ok_button_ = button;
@@ -92,7 +92,7 @@ void ConfirmInfoBar::ViewHierarchyChanged(
 
     if (delegate->GetButtons() & ConfirmInfoBarDelegate::BUTTON_CANCEL) {
       if (ui::MaterialDesignController::IsModeMaterial()) {
-        views::MdTextButton* button = views::MdTextButton::CreateMdButton(
+        views::MdTextButton* button = views::MdTextButton::Create(
             this,
             delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
         if (delegate->GetButtons() == ConfirmInfoBarDelegate::BUTTON_CANCEL) {

content/shell/browser/shell_views.cc

@@ -132,7 +132,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
           toolbar_layout->AddColumnSet(0);
       // Back button
       back_button_ =
-          views::MdTextButton::CreateMdButton(this, base::ASCIIToUTF16("Back"));
+          views::MdTextButton::Create(this, base::ASCIIToUTF16("Back"));
       gfx::Size back_button_size = back_button_->GetPreferredSize();
       toolbar_column_set->AddColumn(views::GridLayout::CENTER,
                                     views::GridLayout::CENTER, 0,
@@ -140,8 +140,8 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
                                     back_button_size.width(),
                                     back_button_size.width() / 2);
       // Forward button
-      forward_button_ = views::MdTextButton::CreateMdButton(
-          this, base::ASCIIToUTF16("Forward"));
+      forward_button_ =
+          views::MdTextButton::Create(this, base::ASCIIToUTF16("Forward"));
       gfx::Size forward_button_size = forward_button_->GetPreferredSize();
       toolbar_column_set->AddColumn(views::GridLayout::CENTER,
                                     views::GridLayout::CENTER, 0,
@@ -149,8 +149,8 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
                                     forward_button_size.width(),
                                     forward_button_size.width() / 2);
       // Refresh button
-      refresh_button_ = views::MdTextButton::CreateMdButton(
-          this, base::ASCIIToUTF16("Refresh"));
+      refresh_button_ =
+          views::MdTextButton::Create(this, base::ASCIIToUTF16("Refresh"));
       gfx::Size refresh_button_size = refresh_button_->GetPreferredSize();
       toolbar_column_set->AddColumn(views::GridLayout::CENTER,
                                     views::GridLayout::CENTER, 0,
@@ -159,7 +159,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
                                     refresh_button_size.width() / 2);
       // Stop button
       stop_button_ =
-          views::MdTextButton::CreateMdButton(this, base::ASCIIToUTF16("Stop"));
+          views::MdTextButton::Create(this, base::ASCIIToUTF16("Stop"));
       gfx::Size stop_button_size = stop_button_->GetPreferredSize();
       toolbar_column_set->AddColumn(views::GridLayout::CENTER,
                                     views::GridLayout::CENTER, 0,

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);

ui/app_list/views/search_result_actions_view.cc

@@ -80,7 +80,7 @@ void SearchResultActionsView::CreateImageButton(
 void SearchResultActionsView::CreateBlueButton(
     const SearchResult::Action& action) {
   views::MdTextButton* button =
-      views::MdTextButton::CreateMdButton(this, action.label_text);
+      views::MdTextButton::Create(this, action.label_text);
   button->SetCallToAction(true);
   button->SetTooltipText(action.tooltip_text);
   button->SetFocusBehavior(FocusBehavior::NEVER);

ui/views/controls/button/md_text_button.cc

@@ -35,7 +35,7 @@ LabelButton* CreateButton(ButtonListener* listener,
                           const base::string16& text,
                           bool md) {
   if (md)
-    return MdTextButton::CreateMdButton(listener, text);
+    return MdTextButton::Create(listener, text);
 
   LabelButton* button = new LabelButton(listener, text);
   button->SetStyle(CustomButton::STYLE_BUTTON);
@@ -105,7 +105,7 @@ LabelButton* MdTextButton::CreateSecondaryUiBlueButton(
     ButtonListener* listener,
     const base::string16& text) {
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
-    MdTextButton* md_button = MdTextButton::CreateMdButton(listener, text);
+    MdTextButton* md_button = MdTextButton::Create(listener, text);
     md_button->SetCallToAction(true);
     return md_button;
   }
@@ -114,8 +114,8 @@ LabelButton* MdTextButton::CreateSecondaryUiBlueButton(
 }
 
 // static
-MdTextButton* MdTextButton::CreateMdButton(ButtonListener* listener,
-                                           const base::string16& text) {
+MdTextButton* MdTextButton::Create(ButtonListener* listener,
+                                   const base::string16& text) {
   MdTextButton* button = new MdTextButton(listener);
   button->SetText(text);
   button->SetFocusForPlatform();

ui/views/controls/button/md_text_button.h

@@ -29,8 +29,8 @@ class VIEWS_EXPORT MdTextButton : public LabelButton {
                                               const base::string16& text);
   static LabelButton* CreateSecondaryUiBlueButton(ButtonListener* listener,
                                                   const base::string16& text);
-  static MdTextButton* CreateMdButton(ButtonListener* listener,
-                                      const base::string16& text);
+  static MdTextButton* Create(ButtonListener* listener,
+                              const base::string16& text);
 
   // See |is_cta_|.
   void SetCallToAction(bool cta);
@@ -57,7 +57,7 @@ class VIEWS_EXPORT MdTextButton : public LabelButton {
   void SetFontList(const gfx::FontList& font_list) override;
 
  private:
-  MdTextButton(ButtonListener* listener);
+  explicit MdTextButton(ButtonListener* listener);
   ~MdTextButton() override;
 
   void UpdatePadding();

ui/views/examples/button_example.cc

@@ -59,14 +59,14 @@ void ButtonExample::CreateExampleView(View* container) {
 
   container->AddChildView(new BlueButton(this, ASCIIToUTF16("Blue Button")));
 
-  container->AddChildView(MdTextButton::CreateMdButton(
-      nullptr, base::ASCIIToUTF16("Material design")));
-  MdTextButton* md_button = MdTextButton::CreateMdButton(
-      nullptr, base::ASCIIToUTF16("Default"));
+  container->AddChildView(
+      MdTextButton::Create(nullptr, base::ASCIIToUTF16("Material design")));
+  MdTextButton* md_button =
+      MdTextButton::Create(nullptr, base::ASCIIToUTF16("Default"));
   md_button->SetIsDefault(true);
   container->AddChildView(md_button);
-  md_button = MdTextButton::CreateMdButton(
-      nullptr, base::ASCIIToUTF16("Call to action"));
+  md_button =
+      MdTextButton::Create(nullptr, base::ASCIIToUTF16("Call to action"));
   md_button->SetCallToAction(true);
   container->AddChildView(md_button);
 

ui/views/examples/button_sticker_sheet.cc

@@ -72,11 +72,11 @@ void MakeButtonsInState(MdTextButton** primary,
                         ButtonListener* listener,
                         Button::ButtonState state) {
   const base::string16 button_text = base::ASCIIToUTF16("Button");
-  *primary = MdTextButton::CreateMdButton(listener, button_text);
+  *primary = MdTextButton::Create(listener, button_text);
   (*primary)->SetCallToAction(true);
   (*primary)->SetState(state);
 
-  *secondary = MdTextButton::CreateMdButton(listener, button_text);
+  *secondary = MdTextButton::Create(listener, button_text);
   (*secondary)->SetState(state);
 }
 

ui/views/focus/focus_traversal_unittest.cc

@@ -376,8 +376,7 @@ void FocusTraversalTest::InitContentView() {
 
   y += label_height + gap_between_labels;
 
-  LabelButton* button =
-      MdTextButton::CreateMdButton(NULL, ASCIIToUTF16("Click me"));
+  LabelButton* button = MdTextButton::Create(NULL, ASCIIToUTF16("Click me"));
   button->SetBounds(label_x, y + 10, 80, 30);
   button->set_id(kFruitButtonID);
   left_container_->AddChildView(button);
@@ -472,19 +471,19 @@ void FocusTraversalTest::InitContentView() {
 
   y = 250;
   int width = 60;
-  button = MdTextButton::CreateMdButton(NULL, ASCIIToUTF16("OK"));
+  button = MdTextButton::Create(NULL, ASCIIToUTF16("OK"));
   button->set_id(kOKButtonID);
   button->SetIsDefault(true);
 
   GetContentsView()->AddChildView(button);
   button->SetBounds(150, y, width, 30);
 
-  button = MdTextButton::CreateMdButton(NULL, ASCIIToUTF16("Cancel"));
+  button = MdTextButton::Create(NULL, ASCIIToUTF16("Cancel"));
   button->set_id(kCancelButtonID);
   GetContentsView()->AddChildView(button);
   button->SetBounds(220, y, width, 30);
 
-  button = MdTextButton::CreateMdButton(NULL, ASCIIToUTF16("Help"));
+  button = MdTextButton::Create(NULL, ASCIIToUTF16("Help"));
   button->set_id(kHelpButtonID);
   GetContentsView()->AddChildView(button);
   button->SetBounds(290, y, width, 30);
@@ -537,7 +536,7 @@ void FocusTraversalTest::InitContentView() {
   text_field->SetBounds(10, 10, 100, 20);
   text_field->set_id(kSearchTextfieldID);
 
-  button = MdTextButton::CreateMdButton(NULL, ASCIIToUTF16("Search"));
+  button = MdTextButton::Create(NULL, ASCIIToUTF16("Search"));
   contents->AddChildView(button);
   button->SetBounds(112, 5, 60, 30);
   button->set_id(kSearchButtonID);
@@ -560,11 +559,11 @@ void FocusTraversalTest::InitContentView() {
   contents->SetFocusBehavior(View::FocusBehavior::ALWAYS);
   contents->set_background(Background::CreateSolidBackground(SK_ColorBLUE));
   contents->set_id(kThumbnailContainerID);
-  button = MdTextButton::CreateMdButton(NULL, ASCIIToUTF16("Star"));
+  button = MdTextButton::Create(NULL, ASCIIToUTF16("Star"));
   contents->AddChildView(button);
   button->SetBounds(5, 5, 50, 30);
   button->set_id(kThumbnailStarID);
-  button = MdTextButton::CreateMdButton(NULL, ASCIIToUTF16("SuperStar"));
+  button = MdTextButton::Create(NULL, ASCIIToUTF16("SuperStar"));
   contents->AddChildView(button);
   button->SetBounds(60, 5, 100, 30);
   button->set_id(kThumbnailSuperStarID);