Minor infobar cleanup.

components/translate/core/browser/translate_infobar_delegate.cc

 // Copyright 2014 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 "components/translate/core/browser/translate_infobar_delegate.h"
 
 #include <algorithm>
 
 #include "base/i18n/string_compare.h"
 #include "base/metrics/histogram.h"
@@ skipping 250 matching lines @@
           kNeverTranslateMinCount);
 }
 
 bool TranslateInfoBarDelegate::ShouldShowAlwaysTranslateShortcut() {
   DCHECK_EQ(translate::TRANSLATE_STEP_BEFORE_TRANSLATE, step_);
   return !is_off_the_record_ &&
       (prefs_->GetTranslationAcceptedCount(original_language_code()) >=
           kAlwaysTranslateMinCount);
 }
 
+#if defined(OS_IOS)
+void TranslateInfoBarDelegate::ShowNeverTranslateInfobar() {
+  Create(true, translate_manager_, infobar()->owner(), is_off_the_record_,
+         translate::TRANSLATE_STEP_NEVER_TRANSLATE, original_language_code(),
+         target_language_code(), TranslateErrors::NONE, false);
+}
+#endif
+
 // static
 void TranslateInfoBarDelegate::GetAfterTranslateStrings(
     std::vector<base::string16>* strings,
     bool* swap_languages,
     bool autodetermined_source_language) {
   DCHECK(strings);
 
   if (autodetermined_source_language) {
     size_t offset;
     base::string16 text = l10n_util::GetStringFUTF16(
@@ skipping 48 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;
 }
 
-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);
+infobars::InfoBarDelegate::Type
+TranslateInfoBarDelegate::GetInfoBarType() const {
+  return PAGE_ACTION_TYPE;
 }
 
 int TranslateInfoBarDelegate::GetIconID() const {
   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);
 }
 
+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);
+}
+
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }
 
-#if defined(OS_IOS)
-void TranslateInfoBarDelegate::ShowNeverTranslateInfobar() {
-  Create(true, translate_manager_, infobar()->owner(), is_off_the_record_,
-         translate::TRANSLATE_STEP_NEVER_TRANSLATE, original_language_code(),
-         target_language_code(), TranslateErrors::NONE, false);
-}
-#endif
-
 }  // namespace translate