Partially update TranslateBubbleView for Harmony controls.

chrome/browser/ui/views/translate/translate_bubble_view.cc

 // Copyright 2013 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 "chrome/browser/ui/views/translate/translate_bubble_view.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <string>
 #include <utility>
@@ skipping 21 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/models/simple_combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/blue_button.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/menu_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
-views::LabelButton* CreateBlueButton(views::ButtonListener* listener,
-                                     const base::string16& label,
-                                     int id) {
-  views::LabelButton* button = new views::BlueButton(listener, label);
-  button->set_id(id);
-  return button;
-}
-
-views::LabelButton* CreateLabelButton(views::ButtonListener* listener,
-                                      const base::string16& label,
-                                      int id) {
-  views::LabelButton* button = new views::LabelButton(listener, label);
-  button->set_id(id);
-  button->SetStyle(views::Button::STYLE_BUTTON);
-  return button;
-}
-
 views::Link* CreateLink(views::LinkListener* listener,
-                        const base::string16& text,
+                        int resource_id,
                         int id) {
-  views::Link* link = new views::Link(text);
+  views::Link* link = new views::Link(l10n_util::GetStringUTF16(resource_id));
   link->set_listener(listener);
   link->set_id(id);
   return link;
 }
 
-views::Link* CreateLink(views::LinkListener* listener,
-                        int resource_id,
-                        int id) {
-  return CreateLink(listener, l10n_util::GetStringUTF16(resource_id), id);
-}
-
 // TODO(ftang) Restore icons in CreateViewAfterTranslate and CreateViewError
 // without causing layout issues; see http://crbug.com/610351
 void AddIconToLayout(views::GridLayout* layout) {
   views::ImageView* icon = new views::ImageView();
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   icon->SetImage(bundle.GetImageNamed(IDR_TRANSLATE_ICON_BUBBLE).ToImageSkia());
   layout->AddView(icon);
 }
 
 bool Use2016Q2UI() {
@@ skipping 526 matching lines @@
   }
   if (Use2016Q2UI()) {
     layout->AddPaddingRow(0, views::kPanelSubVerticalSpacing);
   } else {
     layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
   }
 
   layout->StartRow(0, COLUMN_SET_ID_CONTENT);
   views::LabelButton* accept_button =
       Use2016Q2UI()
-          ? CreateBlueButton(
-                this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT),
-                BUTTON_ID_TRANSLATE)
-          : CreateLabelButton(
-                this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT),
-                BUTTON_ID_TRANSLATE);
+          ? views::MdTextButton::CreateSecondaryUiBlueButton(
+                this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT))
+          : views::MdTextButton::CreateSecondaryUiButton(
+                this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT));
+  accept_button->set_id(BUTTON_ID_TRANSLATE);
   layout->AddView(accept_button);
   accept_button->SetIsDefault(true);
   if (Use2016Q2UI()) {
     denial_menu_button_ = new views::MenuButton(
         l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_OPTIONS_MENU_BUTTON),
         this, true);
     denial_menu_button_->SetStyle(views::Button::STYLE_BUTTON);
     layout->AddView(denial_menu_button_);
   } else {
     std::vector<base::string16> items(
@@ skipping 50 matching lines @@
                 GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, COLUMN_SET_ID_MESSAGE);
   if (Use2016Q2UI())
     AddIconToLayout(layout);
   layout->AddView(label);
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, COLUMN_SET_ID_CONTENT);
-  views::LabelButton* revert_button = CreateLabelButton(
-      this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_REVERT),
-      BUTTON_ID_SHOW_ORIGINAL);
+  views::LabelButton* revert_button =
+      views::MdTextButton::CreateSecondaryUiButton(
+          this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_REVERT));
+  revert_button->set_id(BUTTON_ID_SHOW_ORIGINAL);
   revert_button->SetEnabled(false);
   layout->AddView(revert_button);
 
   return view;
 }
 
 views::View* TranslateBubbleView::CreateViewAfterTranslate() {
   views::Label* label = new views::Label(
       l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_TRANSLATED));
 
@@ skipping 25 matching lines @@
                 GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, COLUMN_SET_ID_MESSAGE);
   layout->AddView(label);
   layout->AddView(
       CreateLink(this, IDS_TRANSLATE_BUBBLE_ADVANCED, LINK_ID_ADVANCED));
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, COLUMN_SET_ID_CONTENT);
-  layout->AddView(CreateLabelButton(
-      this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_REVERT),
-      BUTTON_ID_SHOW_ORIGINAL));
+  views::LabelButton* button = views::MdTextButton::CreateSecondaryUiButton(
+      this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_REVERT));
+  button->set_id(BUTTON_ID_SHOW_ORIGINAL);
+  layout->AddView(button);
 
   return view;
 }
 
 views::View* TranslateBubbleView::CreateViewError() {
   views::Label* label = new views::Label(
       l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_COULD_NOT_TRANSLATE));
 
   views::View* view = new views::View();
   views::GridLayout* layout = new views::GridLayout(view);
@@ skipping 23 matching lines @@
                 GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, COLUMN_SET_ID_MESSAGE);
   layout->AddView(label);
   layout->AddView(
       CreateLink(this, IDS_TRANSLATE_BUBBLE_ADVANCED, LINK_ID_ADVANCED));
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, COLUMN_SET_ID_CONTENT);
-  layout->AddView(CreateLabelButton(
-      this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_TRY_AGAIN),
-      BUTTON_ID_TRY_AGAIN));
+  views::LabelButton* button = views::MdTextButton::CreateSecondaryUiButton(
+      this, l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_TRY_AGAIN));
+  button->set_id(BUTTON_ID_TRY_AGAIN);
+  layout->AddView(button);
 
   return view;
 }
 
 // TODO(hajimehoshi): Revice this later to show a specific message for each
 // error. (crbug/307350)
 views::View* TranslateBubbleView::CreateViewAdvanced() {
   views::Label* source_language_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_PAGE_LANGUAGE));
 
@@ skipping 67 matching lines @@
   if (!is_in_incognito_window_) {
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     layout->StartRow(0, COLUMN_SET_ID_LANGUAGES);
     layout->SkipColumns(1);
     layout->AddView(advanced_always_translate_checkbox_);
   }
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, COLUMN_SET_ID_BUTTONS);
+  // TODO(estade): this should use CreateExtraView().
   layout->AddView(CreateLink(this, IDS_TRANSLATE_BUBBLE_LANGUAGE_SETTINGS,
                              LINK_ID_LANGUAGE_SETTINGS));
   advanced_done_button_ =
-      Use2016Q2UI()
-          ? CreateBlueButton(this, l10n_util::GetStringUTF16(IDS_DONE),
-                             BUTTON_ID_DONE)
-          : CreateLabelButton(this, l10n_util::GetStringUTF16(IDS_DONE),
-                              BUTTON_ID_DONE);
+      Use2016Q2UI() ? views::MdTextButton::CreateSecondaryUiBlueButton(
+                          this, l10n_util::GetStringUTF16(IDS_DONE))
+                    : views::MdTextButton::CreateSecondaryUiButton(
+                          this, l10n_util::GetStringUTF16(IDS_DONE));
+  advanced_done_button_->set_id(BUTTON_ID_DONE);
   advanced_done_button_->SetIsDefault(true);
-  advanced_cancel_button_ = CreateLabelButton(
-      this, l10n_util::GetStringUTF16(IDS_CANCEL), BUTTON_ID_CANCEL);
+  advanced_cancel_button_ = views::MdTextButton::CreateSecondaryUiButton(
+      this, l10n_util::GetStringUTF16(IDS_CANCEL));
+  advanced_cancel_button_->set_id(BUTTON_ID_CANCEL);
+  // TODO(estade): this should be using GetDialogButtons().
   layout->AddView(advanced_done_button_);
   layout->AddView(advanced_cancel_button_);
 
   UpdateAdvancedView();
 
   return view;
 }
 
 views::Checkbox* TranslateBubbleView::GetAlwaysTranslateCheckbox() {
   if (model_->GetViewState() == TranslateBubbleModel::VIEW_STATE_ADVANCED) {
@@ skipping 45 matching lines @@
   base::string16 label;
   if (model_->IsPageTranslatedInCurrentLanguages())
     label = l10n_util::GetStringUTF16(IDS_DONE);
   else
     label = l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT);
   advanced_done_button_->SetText(label);
   advanced_done_button_->SizeToPreferredSize();
   if (advanced_view_)
     advanced_view_->Layout();
 }