Reland "Google Translate branding on desktop translate bubble"

Change-Id: Id2972c13c2da888a4c7f2974b933ae190fdfe2fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1756147Reviewed-by: Alexandre Frechette <frechette@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Commit-Queue: anthonyvd <anthonyvd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#687664}

chrome/app/theme/theme_resources.grd

@@ -309,9 +309,7 @@
       </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>
+      <structure type="chrome_scaled_image" name="IDR_TRANSLATE_BUBBLE_ICON" file="common/translate_bubble_icon.png" />
       <if expr="not _google_chrome">
         <if expr="not is_android">
           <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="chromium/webstore_icon.png" />
@@ -326,6 +324,8 @@
           <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

@@ -77,6 +77,16 @@ class AdvancedViewContainer : public views::View {
  private:
   DISALLOW_COPY_AND_ASSIGN(AdvancedViewContainer);
 };
+
+bool UseGoogleTranslateBranding() {
+  // Only use Google Translate branding in Chrome branded builds.
+#if defined(GOOGLE_CHROME_BUILD)
+  return true;
+#else
+  return false;
+#endif
+}
+
 }  // namespace
 
 // static
@@ -332,6 +342,38 @@ void TranslateBubbleView::ButtonPressed(views::Button* sender,
   }
 }
 
+std::unique_ptr<views::View> TranslateBubbleView::CreateFootnoteView() {
+#if defined(GOOGLE_CHROME_BUILD)
+  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
+  const int translate_icon_id = IDR_TRANSLATE_TAB_WORDMARK;
+  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;
+#else
+  return nullptr;
+#endif
+}
+
 views::View* TranslateBubbleView::GetInitiallyFocusedView() {
   return GetCurrentView()->GetNextFocusableView();
 }
@@ -609,6 +651,9 @@ TranslateBubbleView::TranslateBubbleView(
           web_contents && web_contents->GetBrowserContext()->IsOffTheRecord()),
       bubble_ui_model_(language::GetTranslateUiBubbleModel()) {
   translate_bubble_view_ = this;
+
+  UpdateInsets(TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE);
+
   if (web_contents)  // web_contents can be null in unit_tests.
     mouse_handler_.reset(new WebContentMouseHandler(this, web_contents));
   chrome::RecordDialogCreation(chrome::DialogIdentifier::TRANSLATE);
@@ -872,15 +917,6 @@ 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.
@@ -902,7 +938,6 @@ 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;
@@ -923,12 +958,15 @@ 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));
+  if (!UseGoogleTranslateBranding()) {
+    // Column and padding for the optional translate icon.
+    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(
@@ -945,7 +983,19 @@ std::unique_ptr<views::View> TranslateBubbleView::CreateViewTab() {
                 0);
 
   layout->StartRow(1, kColumnSetId);
-  layout->AddView(std::move(language_icon));
+  if (!UseGoogleTranslateBranding()) {
+    // If the bottom branding isn't showing, display the leading translate icon
+    // otherwise it's not obvious what the bubble is about. This should only
+    // happen on non-Chrome-branded builds.
+    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);
+    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));
@@ -1679,6 +1729,8 @@ views::Checkbox* TranslateBubbleView::GetAlwaysTranslateCheckbox() {
 
 void TranslateBubbleView::SwitchView(
     TranslateBubbleModel::ViewState view_state) {
+  UpdateInsets(view_state);
+
   TranslateBubbleModel::ViewState current_state = model_->GetViewState();
   if (bubble_ui_model_ == language::TranslateUIBubbleModel::TAB) {
     SwitchTabForViewState(view_state);
@@ -1691,6 +1743,7 @@ void TranslateBubbleView::SwitchView(
   model_->SetViewState(view_state);
   if (view_state == TranslateBubbleModel::VIEW_STATE_ADVANCED)
     UpdateAdvancedView();
+
   UpdateChildVisibilities();
   SizeToContents();
 }
@@ -1736,3 +1789,36 @@ void TranslateBubbleView::UpdateLanguageNames(
         l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_UNKNOWN_LANGUAGE);
   }
 }
+
+void TranslateBubbleView::UpdateInsets(TranslateBubbleModel::ViewState state) {
+  if (bubble_ui_model_ != language::TranslateUIBubbleModel::TAB ||
+      !UseGoogleTranslateBranding()) {
+    // If not in a mode that can display a footer, don't touch the default
+    // insets.
+    return;
+  }
+
+  // Since these are only created once when this code is executed for the first
+  // time, |default_margins| will always contain the default margins() value for
+  // this view.
+  static const gfx::Insets kDefaultMargins = translate_bubble_view_->margins();
+  // Paddings of the ClientFrameView from mock.
+  // Up: 6px.
+  // Left: 16px = 320px - 180px - 124px.
+  // Bottom: 0px from the NonClientFrameView.
+  // Right: 8px
+  static const gfx::Insets kNoBottomMargins = gfx::Insets(6, 16, 0, 8);
+
+  // TAB UI does not have gap in between ClientFrameView and NonClientFrameView
+  // in these states.
+  if (state == TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE ||
+      state == TranslateBubbleModel::VIEW_STATE_TRANSLATING ||
+      state == TranslateBubbleModel::VIEW_STATE_AFTER_TRANSLATE) {
+    // In these states there will be a footer, so remove the bottom padding.
+    translate_bubble_view_->set_margins(kNoBottomMargins);
+  } else {
+    // Restore the bottom padding if the bubble is in a mode that doesn't have a
+    // footer.
+    translate_bubble_view_->set_margins(kDefaultMargins);
+  }
+}

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

@@ -33,6 +33,7 @@
 #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;
 
@@ -91,6 +92,7 @@ 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;
@@ -333,6 +335,8 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
   void UpdateLanguageNames(base::string16* original_language_name,
                            base::string16* target_language_name);
 
+  void UpdateInsets(TranslateBubbleModel::ViewState state);
+
   static TranslateBubbleView* translate_bubble_view_;
 
   views::View* before_translate_view_ = nullptr;