Renaming TranslateManager2 to TranslateManager

Switching to the new TranslateManager code (renaming TranslateManager2 to TranslateManager and similarly for all similar classes).

Original review:
http://codereview.chromium.org/2825032/show

BUG=40828
TEST=Make sure translate still works as expected on all platforms.

Review URL: http://codereview.chromium.org/2885015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51421 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 31 insertions, 31 deletions

diff --git a/chrome/browser/gtk/translate/after_translate_infobar_gtk.cc b/chrome/browser/gtk/translate/after_translate_infobar_gtk.cc
index 1fab560..6fefadd 100644
--- a/chrome/browser/gtk/translate/after_translate_infobar_gtk.cc
+++ b/chrome/browser/gtk/translate/after_translate_infobar_gtk.cc
@@ -8,11 +8,11 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/translate/translate_infobar_delegate2.h"
+#include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "grit/generated_resources.h"
 
 AfterTranslateInfoBar::AfterTranslateInfoBar(
-    TranslateInfoBarDelegate2* delegate)
+    TranslateInfoBarDelegate* delegate)
     : TranslateInfoBarBase(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
@@ -25,7 +25,7 @@ void AfterTranslateInfoBar::Init() {
 
   bool swapped_language_combos = false;
   std::vector<string16> strings;
-  TranslateInfoBarDelegate2::GetAfterTranslateStrings(
+  TranslateInfoBarDelegate::GetAfterTranslateStrings(
       &strings, &swapped_language_combos);
   DCHECK(strings.size() == 3U);
 
diff --git a/chrome/browser/gtk/translate/after_translate_infobar_gtk.h b/chrome/browser/gtk/translate/after_translate_infobar_gtk.h
index 576b023..221b718 100644
--- a/chrome/browser/gtk/translate/after_translate_infobar_gtk.h
+++ b/chrome/browser/gtk/translate/after_translate_infobar_gtk.h
@@ -8,11 +8,11 @@
 #include "base/task.h"
 #include "chrome/browser/gtk/translate/translate_infobar_base_gtk.h"
 
-class TranslateInfoBarDelegate2;
+class TranslateInfoBarDelegate;
 
 class AfterTranslateInfoBar : public TranslateInfoBarBase {
  public:
-  explicit AfterTranslateInfoBar(TranslateInfoBarDelegate2* delegate);
+  explicit AfterTranslateInfoBar(TranslateInfoBarDelegate* delegate);
   virtual ~AfterTranslateInfoBar();
 
   // Overridden from TranslateInfoBarBase:
diff --git a/chrome/browser/gtk/translate/before_translate_infobar_gtk.cc b/chrome/browser/gtk/translate/before_translate_infobar_gtk.cc
index 53b9773..657f1af 100644
--- a/chrome/browser/gtk/translate/before_translate_infobar_gtk.cc
+++ b/chrome/browser/gtk/translate/before_translate_infobar_gtk.cc
@@ -7,11 +7,11 @@
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/translate/translate_infobar_delegate2.h"
+#include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "grit/generated_resources.h"
 
 BeforeTranslateInfoBar::BeforeTranslateInfoBar(
-    TranslateInfoBarDelegate2* delegate)
+    TranslateInfoBarDelegate* delegate)
     : TranslateInfoBarBase(delegate) {
 }
 
diff --git a/chrome/browser/gtk/translate/before_translate_infobar_gtk.h b/chrome/browser/gtk/translate/before_translate_infobar_gtk.h
index f31c529..5875dd9 100644
--- a/chrome/browser/gtk/translate/before_translate_infobar_gtk.h
+++ b/chrome/browser/gtk/translate/before_translate_infobar_gtk.h
@@ -7,11 +7,11 @@
 
 #include "chrome/browser/gtk/translate/translate_infobar_base_gtk.h"
 
-class TranslateInfoBarDelegate2;
+class TranslateInfoBarDelegate;
 
 class BeforeTranslateInfoBar : public TranslateInfoBarBase {
  public:
-  explicit BeforeTranslateInfoBar(TranslateInfoBarDelegate2* delegate);
+  explicit BeforeTranslateInfoBar(TranslateInfoBarDelegate* delegate);
   virtual ~BeforeTranslateInfoBar();
 
   // Overridden from TranslateInfoBarBase:
diff --git a/chrome/browser/gtk/translate/translate_infobar_base_gtk.cc b/chrome/browser/gtk/translate/translate_infobar_base_gtk.cc
index 80ee803..1c023c8 100644
--- a/chrome/browser/gtk/translate/translate_infobar_base_gtk.cc
+++ b/chrome/browser/gtk/translate/translate_infobar_base_gtk.cc
@@ -8,8 +8,8 @@
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/translate/options_menu_model2.h"
-#include "chrome/browser/translate/translate_infobar_delegate2.h"
+#include "chrome/browser/translate/options_menu_model.h"
+#include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/gtk/translate/after_translate_infobar_gtk.h"
 #include "chrome/browser/gtk/translate/before_translate_infobar_gtk.h"
 #include "chrome/browser/gtk/translate/translate_message_infobar_gtk.h"
@@ -32,18 +32,18 @@ enum {
 
 }  // namespace
 
-TranslateInfoBarBase::TranslateInfoBarBase(TranslateInfoBarDelegate2* delegate)
+TranslateInfoBarBase::TranslateInfoBarBase(TranslateInfoBarDelegate* delegate)
     : InfoBar(delegate) {
-  TranslateInfoBarDelegate2::BackgroundAnimationType animation =
+  TranslateInfoBarDelegate::BackgroundAnimationType animation =
       delegate->background_animation_type();
-  if (animation != TranslateInfoBarDelegate2::kNone) {
+  if (animation != TranslateInfoBarDelegate::kNone) {
     background_color_animation_.reset(new SlideAnimation(this));
     background_color_animation_->SetTweenType(Tween::LINEAR);
     background_color_animation_->SetSlideDuration(500);
-    if (animation == TranslateInfoBarDelegate2::kNormalToError) {
+    if (animation == TranslateInfoBarDelegate::kNormalToError) {
       background_color_animation_->Show();
     } else {
-      DCHECK_EQ(TranslateInfoBarDelegate2::kErrorToNormal, animation);
+      DCHECK_EQ(TranslateInfoBarDelegate::kErrorToNormal, animation);
       // Hide() runs the animation in reverse.
       background_color_animation_->Reset(1.0);
       background_color_animation_->Hide();
@@ -136,7 +136,7 @@ GtkWidget* TranslateInfoBarBase::CreateLanguageCombobox(int selected_language,
                                            G_TYPE_INT, G_TYPE_STRING);
   bool set_selection = false;
   GtkTreeIter selected_iter;
-  TranslateInfoBarDelegate2* delegate = GetDelegate();
+  TranslateInfoBarDelegate* delegate = GetDelegate();
   for (int i = 0; i < delegate->GetLanguageCount(); ++i) {
     if (i == exclude_language)
       continue;
@@ -179,8 +179,8 @@ int TranslateInfoBarBase::GetLanguageComboboxActiveId(GtkComboBox* combo) {
   return id;
 }
 
-TranslateInfoBarDelegate2* TranslateInfoBarBase::GetDelegate() const {
-  return static_cast<TranslateInfoBarDelegate2*>(delegate());
+TranslateInfoBarDelegate* TranslateInfoBarBase::GetDelegate() const {
+  return static_cast<TranslateInfoBarDelegate*>(delegate());
 }
 
 // static
@@ -206,14 +206,14 @@ GtkWidget* TranslateInfoBarBase::BuildOptionsMenuButton() {
 
 void TranslateInfoBarBase::OnOptionsClicked(GtkWidget* sender) {
   if (!options_menu_model_.get()) {
-    options_menu_model_.reset(new OptionsMenuModel2(GetDelegate()));
+    options_menu_model_.reset(new OptionsMenuModel(GetDelegate()));
     options_menu_menu_.reset(new MenuGtk(NULL, options_menu_model_.get()));
   }
   options_menu_menu_->Popup(sender, 1, gtk_get_current_event_time());
 }
 
 // TranslateInfoBarDelegate specific method:
-InfoBar* TranslateInfoBarDelegate2::CreateInfoBar() {
+InfoBar* TranslateInfoBarDelegate::CreateInfoBar() {
   TranslateInfoBarBase* infobar = NULL;
   switch (type_) {
     case kBeforeTranslate:
diff --git a/chrome/browser/gtk/translate/translate_infobar_base_gtk.h b/chrome/browser/gtk/translate/translate_infobar_base_gtk.h
index f2911f6..a1d7292 100644
--- a/chrome/browser/gtk/translate/translate_infobar_base_gtk.h
+++ b/chrome/browser/gtk/translate/translate_infobar_base_gtk.h
@@ -9,8 +9,8 @@
 #include "chrome/browser/gtk/infobar_gtk.h"
 
 class MenuGtk;
-class OptionsMenuModel2;
-class TranslateInfoBarDelegate2;
+class OptionsMenuModel;
+class TranslateInfoBarDelegate;
 
 // This class contains some of the base functionality that translate infobars
 // use.
@@ -18,7 +18,7 @@ class TranslateInfoBarBase : public TranslateInfoBarView,
                              public InfoBar,
                              public AnimationDelegate {
  public:
-  explicit TranslateInfoBarBase(TranslateInfoBarDelegate2* delegate);
+  explicit TranslateInfoBarBase(TranslateInfoBarDelegate* delegate);
   virtual ~TranslateInfoBarBase();
 
   // Initializes the infobar widgets. Should be called after the object has been
@@ -59,8 +59,8 @@ class TranslateInfoBarBase : public TranslateInfoBarView,
   // language id.
   static int GetLanguageComboboxActiveId(GtkComboBox* combo);
 
-  // Convenience to retrieve the TranslateInfoBarDelegate2 for this infobar.
-  TranslateInfoBarDelegate2* GetDelegate() const;
+  // Convenience to retrieve the TranslateInfoBarDelegate for this infobar.
+  TranslateInfoBarDelegate* GetDelegate() const;
 
  private:
   // Builds a button with an arrow in it to emulate the menu-button style from
@@ -68,7 +68,7 @@ class TranslateInfoBarBase : public TranslateInfoBarView,
   static GtkWidget* BuildOptionsMenuButton();
 
   // The menu displayed when the Options button is pressed.
-  scoped_ptr<OptionsMenuModel2> options_menu_model_;
+  scoped_ptr<OptionsMenuModel> options_menu_model_;
   scoped_ptr<MenuGtk> options_menu_menu_;
 
   CHROMEGTK_CALLBACK_0(TranslateInfoBarBase, void, OnOptionsClicked);
diff --git a/chrome/browser/gtk/translate/translate_message_infobar_gtk.cc b/chrome/browser/gtk/translate/translate_message_infobar_gtk.cc
index 3a5b828..22e800d 100644
--- a/chrome/browser/gtk/translate/translate_message_infobar_gtk.cc
+++ b/chrome/browser/gtk/translate/translate_message_infobar_gtk.cc
@@ -6,10 +6,10 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/translate/translate_infobar_delegate2.h"
+#include "chrome/browser/translate/translate_infobar_delegate.h"
 
 TranslateMessageInfoBar::TranslateMessageInfoBar(
-    TranslateInfoBarDelegate2* delegate)
+    TranslateInfoBarDelegate* delegate)
     : TranslateInfoBarBase(delegate) {
 }
 
diff --git a/chrome/browser/gtk/translate/translate_message_infobar_gtk.h b/chrome/browser/gtk/translate/translate_message_infobar_gtk.h
index f0e70a3..1dd4665 100644
--- a/chrome/browser/gtk/translate/translate_message_infobar_gtk.h
+++ b/chrome/browser/gtk/translate/translate_message_infobar_gtk.h
@@ -7,11 +7,11 @@
 
 #include "chrome/browser/gtk/translate/translate_infobar_base_gtk.h"
 
-class TranslateInfoBarDelegate2;
+class TranslateInfoBarDelegate;
 
 class TranslateMessageInfoBar : public TranslateInfoBarBase {
  public:
-  explicit TranslateMessageInfoBar(TranslateInfoBarDelegate2* delegate);
+  explicit TranslateMessageInfoBar(TranslateInfoBarDelegate* delegate);
   virtual ~TranslateMessageInfoBar();
 
   // Overridden from TranslateInfoBarBase: