Move TranslateInfoBarDelegate and OptionsMenuModel to the Translate component.

components/translate/core/browser/translate_infobar_delegate.cc

 // Copyright 2012 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/translate/translate_infobar_delegate.h"
+#include "components/translate/core/browser/translate_infobar_delegate.h"
 
 #include <algorithm>
 
 #include "base/i18n/string_compare.h"
 #include "base/metrics/histogram.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "components/translate/core/browser/language_state.h"
 #include "components/translate/core/browser/translate_accept_languages.h"
 #include "components/translate/core/browser/translate_client.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_driver.h"
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/common/translate_constants.h"
 #include "grit/component_strings.h"
-#include "grit/theme_resources.h"
-#include "third_party/icu/source/i18n/unicode/coll.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // Counts used to decide whether infobars should be shown.
 // Android and iOS implementations do not offer a drop down (for space reasons),
 // so we are more aggressive about showing the shortcut to never translate.
 // The "Always Translate" option is always shown on iOS and Android.
 #if defined(OS_ANDROID)
-  const int kAlwaysTranslateMinCount = 1;
-  const int kNeverTranslateMinCount = 1;
+const int kAlwaysTranslateMinCount = 1;
+const int kNeverTranslateMinCount = 1;
 #elif defined(OS_IOS)
-  // The iOS implementation, like the Android implementation, shows the "Never
-  // translate" infobar after two denials. There is an offset of one because on
-  // Android the last event is not counted.
-  const int kAlwaysTranslateMinCount = 1;
-  const int kNeverTranslateMinCount = 2;
+// The iOS implementation, like the Android implementation, shows the "Never
+// translate" infobar after two denials. There is an offset of one because on
+// Android the last event is not counted.
+const int kAlwaysTranslateMinCount = 1;
+const int kNeverTranslateMinCount = 2;
 #else
-  const int kAlwaysTranslateMinCount = 3;
-  const int kNeverTranslateMinCount = 3;
+const int kAlwaysTranslateMinCount = 3;
+const int kNeverTranslateMinCount = 3;
 #endif
 
 }  // namespace
 
 const size_t TranslateInfoBarDelegate::kNoIndex = TranslateUIDelegate::NO_INDEX;
 
 TranslateInfoBarDelegate::~TranslateInfoBarDelegate() {
 }
 
 // static
@@ skipping 49 matching lines @@
       scoped_ptr<TranslateInfoBarDelegate>(new TranslateInfoBarDelegate(
           translate_manager, is_off_the_record, step, old_delegate,
           original_language, target_language, error_type,
           triggered_from_menu))));
   if (old_delegate)
     infobar_manager->ReplaceInfoBar(old_infobar, infobar.Pass());
   else
     infobar_manager->AddInfoBar(infobar.Pass());
 }
 
-
 void TranslateInfoBarDelegate::UpdateOriginalLanguageIndex(
     size_t language_index) {
   ui_delegate_.UpdateOriginalLanguageIndex(language_index);
 }
 
 void TranslateInfoBarDelegate::UpdateTargetLanguageIndex(
     size_t language_index) {
   ui_delegate_.UpdateTargetLanguageIndex(language_index);
 }
 
@@ skipping 56 matching lines @@
 
 void TranslateInfoBarDelegate::AlwaysTranslatePageLanguage() {
   DCHECK(!ui_delegate_.ShouldAlwaysTranslate());
   ui_delegate_.SetAlwaysTranslate(true);
   Translate();
 }
 
 void TranslateInfoBarDelegate::NeverTranslatePageLanguage() {
   DCHECK(!ui_delegate_.IsLanguageBlocked());
   ui_delegate_.SetLanguageBlocked(true);
-    infobar()->RemoveSelf();
+  infobar()->RemoveSelf();
 }
 
 base::string16 TranslateInfoBarDelegate::GetMessageInfoBarText() {
   if (step_ == translate::TRANSLATE_STEP_TRANSLATING) {
     base::string16 target_language_name =
         language_name_at(target_language_index());
     return l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_TRANSLATING_TO,
                                       target_language_name);
   }
 
@@ skipping 133 matching lines @@
       prefs_(translate_manager->translate_client()->GetTranslatePrefs()),
       triggered_from_menu_(triggered_from_menu) {
   DCHECK_NE((step_ == translate::TRANSLATE_STEP_TRANSLATE_ERROR),
             (error_type_ == TranslateErrors::NONE));
   DCHECK(translate_manager_);
 
   if (old_delegate && (old_delegate->is_error() != is_error()))
     background_animation_ = is_error() ? NORMAL_TO_ERROR : ERROR_TO_NORMAL;
 }
 
 TranslateClient* TranslateInfoBarDelegate::GetTranslateClient() {

[Peter Kasting, 2014/05/22 17:37:24]

I'm still not clear on where this is actually called.  Is it dead?  Can it be
removed?

[droger, 2014/05/26 12:16:05]

It was only called in one place, I removed it.

   if (!translate_manager_)
     return NULL;
 
   return translate_manager_->translate_client();
 }
 
 // TranslateInfoBarDelegate::CreateInfoBar() is implemented in platform-specific
 // files.
 
 void TranslateInfoBarDelegate::InfoBarDismissed() {
   if (step_ != translate::TRANSLATE_STEP_BEFORE_TRANSLATE)
     return;
 
   // The user closed the infobar without clicking the translate button.
   TranslationDeclined();
   UMA_HISTOGRAM_BOOLEAN("Translate.DeclineTranslateCloseInfobar", true);
 }
 
 int TranslateInfoBarDelegate::GetIconID() const {
-  return IDR_INFOBAR_TRANSLATE;
+  return translate_manager_->translate_client()->GetInfobarIconID();
 }
 
 infobars::InfoBarDelegate::Type TranslateInfoBarDelegate::GetInfoBarType()
     const {
   return PAGE_ACTION_TYPE;
 }
 
 bool TranslateInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   // Note: we allow closing this infobar even if the main frame navigation
   // was programmatic and not initiated by the user - crbug.com/70261 .
   if (!details.is_navigation_to_different_page && !details.is_main_frame)
     return false;
 
   return infobars::InfoBarDelegate::ShouldExpireInternal(details);
 }
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }