Minor infobar cleanup.

* Stop calling GetIconID() as a proxy for having RTTI to detect
  ThreeDAPIInfoBarDelegates.  Just add a downcast function.
* Slightly more reasonable base class function order.
* Fix declaration/definition orders to match base class (and each other) in
  other instances where it was noticeably wrong.
* Keep infobar code consistent about not inlining method definitions in class
  declarations, and making overridden functions private unless otherwise
  necessary.

BUG=none
TEST=none

Review URL: https://codereview.chromium.org/922953002

Cr-Commit-Position: refs/heads/master@{#317685}

2 files changed, 22 insertions, 22 deletions

diff --git a/components/translate/core/browser/translate_infobar_delegate.cc b/components/translate/core/browser/translate_infobar_delegate.cc
index 0d68e13..56bf4de 100644
--- a/components/translate/core/browser/translate_infobar_delegate.cc
+++ b/components/translate/core/browser/translate_infobar_delegate.cc
@@ -268,6 +268,14 @@ bool TranslateInfoBarDelegate::ShouldShowAlwaysTranslateShortcut() {
           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,
@@ -336,24 +344,15 @@ TranslateInfoBarDelegate::TranslateInfoBarDelegate(
     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
@@ -364,17 +363,18 @@ bool TranslateInfoBarDelegate::ShouldExpire(
   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
diff --git a/components/translate/core/browser/translate_infobar_delegate.h b/components/translate/core/browser/translate_infobar_delegate.h
index d9badc6..dca1979 100644
--- a/components/translate/core/browser/translate_infobar_delegate.h
+++ b/components/translate/core/browser/translate_infobar_delegate.h
@@ -197,10 +197,10 @@ class TranslateInfoBarDelegate : public infobars::InfoBarDelegate {
   typedef std::pair<std::string, base::string16> LanguageNamePair;
 
   // InfoBarDelegate:
-  void InfoBarDismissed() override;
+  Type GetInfoBarType() const override;
   int GetIconID() const override;
-  infobars::InfoBarDelegate::Type GetInfoBarType() const override;
   bool ShouldExpire(const NavigationDetails& details) const override;
+  void InfoBarDismissed() override;
   TranslateInfoBarDelegate* AsTranslateInfoBarDelegate() override;
 
   bool is_off_the_record_;