Translate new UX: Fix the visual and behavior of 'Done' button

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 <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 279 matching lines @@
       WebContentsObserver(web_contents),
       before_translate_view_(NULL),
       translating_view_(NULL),
       after_translate_view_(NULL),
       error_view_(NULL),
       advanced_view_(NULL),
       denial_combobox_(NULL),
       source_language_combobox_(NULL),
       target_language_combobox_(NULL),
       always_translate_checkbox_(NULL),
+      advanced_cancel_button_(NULL),
+      advanced_done_button_(NULL),
       model_(model.Pass()),
       is_in_incognito_window_(
           web_contents ?
           web_contents->GetBrowserContext()->IsOffTheRecord() : false),
       browser_(browser),
       translate_executed_(false) {
   if (model_->GetViewState() !=
       TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE) {
     translate_executed_ = true;
   }
@@ skipping 25 matching lines @@
     TranslateBubbleView::ButtonID sender_id) {
   switch (sender_id) {
     case BUTTON_ID_TRANSLATE: {
       translate_executed_ = true;
       model_->Translate();
       break;
     }
     case BUTTON_ID_DONE: {
       if (always_translate_checkbox_)
         model_->SetAlwaysTranslate(always_translate_checkbox_->checked());
-      translate_executed_ = true;
-      model_->Translate();
+      if (model_->IsPageTranslatedInCurrentLanguages()) {
+        model_->GoBackFromAdvanced();
+        UpdateChildVisibilities();
+        SizeToContents();
+      } else {
+        translate_executed_ = true;
+        model_->Translate();
+        SwitchView(TranslateBubbleModel::VIEW_STATE_TRANSLATING);
+      }
       break;
     }
     case BUTTON_ID_CANCEL: {
       model_->GoBackFromAdvanced();
       UpdateChildVisibilities();
       SizeToContents();
       break;
     }
     case BUTTON_ID_TRY_AGAIN: {
       translate_executed_ = true;
@@ skipping 355 matching lines @@
     layout->SkipColumns(1);
     layout->AddView(always_translate_checkbox_);
   }
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, COLUMN_SET_ID_BUTTONS);
   layout->AddView(CreateLink(this,
                              IDS_TRANSLATE_BUBBLE_LEARN_MORE,
                              LINK_ID_LEARN_MORE));
-  views::LabelButton* cancel_button = CreateLabelButton(
+  advanced_cancel_button_ = CreateLabelButton(
       this, l10n_util::GetStringUTF16(IDS_CANCEL), BUTTON_ID_CANCEL);
-  layout->AddView(cancel_button);
-  views::LabelButton* done_button = CreateLabelButton(
+  layout->AddView(advanced_cancel_button_);
+  advanced_done_button_ = CreateLabelButton(
       this, l10n_util::GetStringUTF16(IDS_DONE), BUTTON_ID_DONE);
-  done_button->SetIsDefault(true);
-  layout->AddView(done_button);
+  advanced_done_button_->SetIsDefault(true);
+  layout->AddView(advanced_done_button_);
 
   UpdateAdvancedView();
 
   return view;
 }
 
 void TranslateBubbleView::SwitchView(
     TranslateBubbleModel::ViewState view_state) {
   if (model_->GetViewState() == view_state)
     return;
 
   model_->SetViewState(view_state);
   UpdateChildVisibilities();
+  if (view_state == TranslateBubbleModel::VIEW_STATE_ADVANCED)
+    UpdateAdvancedView();
   SizeToContents();
 }
 
 void TranslateBubbleView::UpdateAdvancedView() {
   DCHECK(source_language_combobox_);
   DCHECK(target_language_combobox_);
+  DCHECK(advanced_done_button_);
 
   string16 source_language_name =
       model_->GetLanguageNameAt(model_->GetOriginalLanguageIndex());
   string16 target_language_name =
       model_->GetLanguageNameAt(model_->GetTargetLanguageIndex());
 
   // "Always translate" checkbox doesn't exist in an incognito window.
   if (always_translate_checkbox_) {
     always_translate_checkbox_->SetText(
         l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ALWAYS));
     always_translate_checkbox_->SetChecked(
         model_->ShouldAlwaysTranslate());
   }
+
+  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);
 }