Revert "Google Translate branding on desktop translate bubble"

This reverts commit 2b2428c1.

Reason for revert:
Having issues with google chrome branched build.
- Missing google chrome icon files;
- TranslateBubbleView::CreateViewAdvancedTabUi needs to refer to
  correct icon resource;

Original change's description:
> Google Translate branding on desktop translate bubble
> 
> This CL adds the new UI to incorporate Google Translate branding
> into the new Button_GM2 and Tab translate bubble UI. Bug 987962 is filed
> to track this new feature request.
> 
> Bug: 963148, 987962
> Change-Id: Ia648f322cea5dae55bd9e21a537775bf74c772a7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1708843
> Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
> Reviewed-by: anthonyvd <anthonyvd@chromium.org>
> Commit-Queue: anthonyvd <anthonyvd@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#681812}

TBR=oshima@chromium.org,anthonyvd@chromium.org,frechette@chromium.org,hhw@google.com

Change-Id: Ib830bc733233cbba4ddb42222e8ecc8eecea0e29
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 963148, 987962
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724575Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681870}

chrome/app/theme/theme_resources.grd

@@ -310,13 +310,15 @@
       </if>
       <!-- Instant Extended API toolbar background is common for all platforms. -->
       <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" />
+      <if expr="not is_android">
+        <structure type="chrome_scaled_image" name="IDR_TRANSLATE_BUBBLE_ICON" file="common/user_manager_tutorial/translate_bubble_icon.png" />
+      </if>
       <if expr="not _google_chrome">
         <if expr="not is_android">
           <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="chromium/webstore_icon.png" />
           <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="chromium/webstore_icon_16.png" />
           <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="chromium/webstore_icon_24.png" />
           <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="chromium/webstore_icon_32.png" />
-          <structure type="chrome_scaled_image" name="IDR_TRANSLATE_BUBBLE_ICON" file="common/translate_bubble_icon.png" />
         </if>
       </if>
       <if expr="_google_chrome">
@@ -325,8 +327,6 @@
           <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="google_chrome/webstore_icon_16.png" />
           <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="google_chrome/webstore_icon_24.png" />
           <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="google_chrome/webstore_icon_32.png" />
-          <structure type="chrome_scaled_image" name="IDR_TRANSLATE_TAB_WORDMARK" file="google_chrome/translate_tab_wordmark.png" />
-          <structure type="chrome_scaled_image" name="IDR_TRANSLATE_BUTTON_WORDMARK" file="google_chrome/translate_button_wordmark.png" />
         </if>
       </if>
     </structures>

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

@@ -332,39 +332,6 @@ void TranslateBubbleView::ButtonPressed(views::Button* sender,
   }
 }
 
-std::unique_ptr<views::View> TranslateBubbleView::CreateFootnoteView() {
-  // TODO(crbug.com/987962): Implement accordingly once Google Translate branding design
-  // for the advanced view is available.
-  if (bubble_ui_model_ != language::TranslateUIBubbleModel::TAB) {
-    return nullptr;
-  }
-  auto view = std::make_unique<views::View>();
-  views::GridLayout* layout =
-      view->SetLayoutManager(std::make_unique<views::GridLayout>());
-
-  // Translate icon
-  #if defined(GOOGLE_CHROME_BUILD) // GOOGLE_CHROME_BUILD
-    const int translate_icon_id = IDR_TRANSLATE_TAB_WORDMARK;
-  #else // GOOGLE_CHROMIUM_BUILD
-    const int translate_icon_id = IDR_TRANSLATE_BUBBLE_ICON;
-  #endif  
-  std::unique_ptr<views::ImageView> translate_icon =
-      std::make_unique<views::ImageView>();
-  gfx::ImageSkia* translate_icon_image =
-      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          translate_icon_id);
-  translate_icon->SetImage(*translate_icon_image);
-
-  views::ColumnSet* cs = layout->AddColumnSet(0);
-  cs->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
-                views::GridLayout::kFixedSize, views::GridLayout::USE_PREF, 0,
-                0);
-  layout->StartRow(1, 0);
-  layout->AddView(std::move(translate_icon));
-
-  return view;
-}
-
 views::View* TranslateBubbleView::GetInitiallyFocusedView() {
   return GetCurrentView()->GetNextFocusableView();
 }
@@ -643,17 +610,6 @@ TranslateBubbleView::TranslateBubbleView(
       bubble_ui_model_(language::GetTranslateUiBubbleModel()) {
   DCHECK(anchor_view);
   translate_bubble_view_ = this;
-
-  // TAB UI does not have gap in between ClientFrameView and NonClientFrameView.
-  if (bubble_ui_model_ == language::TranslateUIBubbleModel::TAB) {
-    // Paddings of the ClientFrameView from mock.
-    // Up: 16px.
-    // Left: 16px = 320px - 180px - 124px.
-    // Bottom: 0px from the NonClientFrameView.
-    // Right: 16px = equals left.
-    constexpr gfx::Insets kTranslateBubbleMargin = gfx::Insets(16, 16, 0, 16);
-    translate_bubble_view_->set_margins(kTranslateBubbleMargin);
-  }
   if (web_contents)  // web_contents can be null in unit_tests.
     mouse_handler_.reset(new WebContentMouseHandler(this, web_contents));
   chrome::RecordDialogCreation(chrome::DialogIdentifier::TRANSLATE);
@@ -917,6 +873,15 @@ std::unique_ptr<views::View> TranslateBubbleView::CreateViewTab() {
   views::GridLayout* layout =
       view->SetLayoutManager(std::make_unique<views::GridLayout>());
 
+  // Language icon
+  const int language_icon_id = IDR_TRANSLATE_BUBBLE_ICON;
+  std::unique_ptr<views::ImageView> language_icon =
+      std::make_unique<views::ImageView>();
+  gfx::ImageSkia* language_icon_image =
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          language_icon_id);
+  language_icon->SetImage(*language_icon_image);
+
   // Tabbed pane for language selection. Can't use unique_ptr because
   // tabs have to be added after the tabbed_pane is added to the parent,
   // when we release ownership of the unique_ptr.
@@ -938,6 +903,7 @@ std::unique_ptr<views::View> TranslateBubbleView::CreateViewTab() {
   tab_translate_options_button->SetInkDropMode(views::Button::InkDropMode::ON);
   tab_translate_options_button->SetID(BUTTON_ID_OPTIONS_MENU_TAB);
   tab_translate_options_button->SetFocusForPlatform();
+  tab_translate_options_button->set_request_focus_on_press(true);
 
   // Close button
   const SkColor close_icon_color = gfx::kChromeIconGrey;
@@ -958,6 +924,12 @@ std::unique_ptr<views::View> TranslateBubbleView::CreateViewTab() {
 
   constexpr int kColumnSetId = 0;
   views::ColumnSet* cs = layout->AddColumnSet(kColumnSetId);
+  cs->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
+                views::GridLayout::kFixedSize, views::GridLayout::USE_PREF, 0,
+                0);
+  cs->AddPaddingColumn(
+      views::GridLayout::kFixedSize,
+      provider->GetDistanceMetric(views::DISTANCE_RELATED_BUTTON_HORIZONTAL));
   cs->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1.0f,
                 views::GridLayout::FIXED, 8, 0);
   cs->AddPaddingColumn(
@@ -974,6 +946,7 @@ std::unique_ptr<views::View> TranslateBubbleView::CreateViewTab() {
                 0);
 
   layout->StartRow(1, kColumnSetId);
+  layout->AddView(std::move(language_icon));
   tabbed_pane_ = layout->AddView(std::move(tabbed_pane));
   layout->AddView(std::move(tab_translate_options_button));
   layout->AddView(std::move(close_button));
@@ -997,20 +970,16 @@ std::unique_ptr<views::View> TranslateBubbleView::GM2CreateView(
       view->SetLayoutManager(std::make_unique<views::GridLayout>());
   ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
 
-  enum { COLUMN_SET_ID_ICON, COLUMN_SET_ID_TITLE, COLUMN_SET_ID_BUTTONS };
+  enum { COLUMN_SET_ID_TITLE, COLUMN_SET_ID_BUTTONS };
 
-  // Translate icon
-  #if defined(GOOGLE_CHROME_BUILD) // GOOGLE_CHROME_BUILD
-    const int translate_icon_id = IDR_TRANSLATE_TAB_WORDMARK;
-  #else // GOOGLE_CHROMIUM_BUILD
-    const int translate_icon_id = IDR_TRANSLATE_BUBBLE_ICON;
-  #endif  
-  std::unique_ptr<views::ImageView> translate_icon =
+  // Language icon
+  const int language_icon_id = IDR_TRANSLATE_BUBBLE_ICON;
+  std::unique_ptr<views::ImageView> language_icon =
       std::make_unique<views::ImageView>();
-  gfx::ImageSkia* translate_icon_image =
+  gfx::ImageSkia* language_icon_image =
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          translate_icon_id);
-  translate_icon->SetImage(*translate_icon_image);
+          language_icon_id);
+  language_icon->SetImage(*language_icon_image);
 
   // Close button
   const SkColor close_icon_color = gfx::kChromeIconGrey;
@@ -1029,13 +998,13 @@ std::unique_ptr<views::View> TranslateBubbleView::GM2CreateView(
   close_button->SetID(BUTTON_ID_CLOSE);
 
   // Initialize a columnset
-  views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_ID_ICON);
+  views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_ID_TITLE);
   cs->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                 views::GridLayout::kFixedSize, views::GridLayout::USE_PREF, 0,
                 0);
-
-  cs = layout->AddColumnSet(COLUMN_SET_ID_TITLE);
-
+  cs->AddPaddingColumn(views::GridLayout::kFixedSize,
+                       2 * provider->GetDistanceMetric(
+                               views::DISTANCE_RELATED_BUTTON_HORIZONTAL));
   cs->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                 views::GridLayout::kFixedSize, views::GridLayout::FIXED, 100,
                 0);
@@ -1070,14 +1039,12 @@ std::unique_ptr<views::View> TranslateBubbleView::GM2CreateView(
                 views::GridLayout::kFixedSize, views::GridLayout::USE_PREF, 0,
                 0);
 
-  layout->StartRow(1, COLUMN_SET_ID_ICON);
-  layout->AddView(std::move(translate_icon));
-
   layout->StartRowWithPadding(
       views::GridLayout::kFixedSize, COLUMN_SET_ID_TITLE,
       views::GridLayout::kFixedSize,
       provider->GetDistanceMetric(views::DISTANCE_UNRELATED_CONTROL_VERTICAL) /
           2);
+  layout->AddView(std::move(language_icon));
   gm2_source_language_label_ =
       layout->AddView(std::move(source_language_label));
   layout->AddView(std::move(status_indicator));

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

@@ -33,7 +33,6 @@
 #include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
-#include "ui/views/window/non_client_view.h"
 
 class Browser;
 
@@ -92,7 +91,6 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
   base::string16 GetWindowTitle() const override;
   void Init() override;
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-  std::unique_ptr<views::View> CreateFootnoteView() override;
 
   // views::WidgetDelegate methods.
   View* GetInitiallyFocusedView() override;