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

1 files changed, 23 insertions, 7 deletions

diff --git a/chrome/browser/translate/languages_menu_model.h b/chrome/browser/translate/languages_menu_model.h
index 00780e9..4b12fe8 100644
--- a/chrome/browser/translate/languages_menu_model.h
+++ b/chrome/browser/translate/languages_menu_model.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_TRANSLATE_LANGUAGES_MENU_MODEL_H_
 #define CHROME_BROWSER_TRANSLATE_LANGUAGES_MENU_MODEL_H_
@@ -8,16 +8,32 @@
 #include "app/menus/simple_menu_model.h"
 
 class TranslateInfoBarDelegate;
+class String16;
 
 // A menu model that builds the contents of the language menus in the translate
-// infobar, i.e. the original and target languages.
-class LanguagesMenuModel : public menus::SimpleMenuModel {
+// infobar. This menu has only one level (no submenus).
+class LanguagesMenuModel : public menus::SimpleMenuModel,
+                           public menus::SimpleMenuModel::Delegate {
  public:
-  explicit LanguagesMenuModel(menus::SimpleMenuModel::Delegate* menu_delegate,
-      TranslateInfoBarDelegate* translate_delegate, bool original_language);
+  enum LanguageType {
+    ORIGINAL,
+    TARGET
+  };
+  LanguagesMenuModel(TranslateInfoBarDelegate* translate_delegate,
+                     LanguageType language_type);
   virtual ~LanguagesMenuModel();
 
+  // menus::SimpleMenuModel::Delegate implementation:
+  virtual bool IsCommandIdChecked(int command_id) const;
+  virtual bool IsCommandIdEnabled(int command_id) const;
+  virtual bool GetAcceleratorForCommandId(int command_id,
+                                          menus::Accelerator* accelerator);
+  virtual void ExecuteCommand(int command_id);
+
  private:
+  TranslateInfoBarDelegate* translate_infobar_delegate_;
+  LanguageType language_type_;
+
   DISALLOW_COPY_AND_ASSIGN(LanguagesMenuModel);
 };