Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: chrome/browser/translate/options_menu_model.cc

Issue 2602003: Refactored the translate infobars. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Synced Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/translate/options_menu_model.h ('k') | chrome/browser/translate/options_menu_model2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/translate/options_menu_model.cc
diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc
index 5f0dd66ed54a2a398cc2036c5f6ac86673c10ea6..5eadbbfa49df0c46587d7327f99d6bf579aae5f1 100644
--- a/chrome/browser/translate/options_menu_model.cc
+++ b/chrome/browser/translate/options_menu_model.cc
@@ -6,6 +6,8 @@
#include "app/l10n_util.h"
#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/translate/translate_infobar_delegate2.h"
#include "chrome/browser/translate/translate_infobars_delegates.h"
#include "grit/generated_resources.h"
@@ -16,6 +18,21 @@ OptionsMenuModel::OptionsMenuModel(menus::SimpleMenuModel::Delegate* delegate,
translate_delegate->original_lang_code());
string16 target_language = translate_delegate->GetDisplayNameForLocale(
translate_delegate->target_lang_code());
+ Init(original_language, target_language);
+}
+
+OptionsMenuModel::OptionsMenuModel(menus::SimpleMenuModel::Delegate* delegate,
+ TranslateInfoBarDelegate2* translate_delegate)
+ : menus::SimpleMenuModel(delegate) {
+ string16 original_language = translate_delegate->GetLanguageDisplayableNameAt(
+ translate_delegate->original_language_index());
+ string16 target_language = translate_delegate->GetLanguageDisplayableNameAt(
+ translate_delegate->target_language_index());
+ Init(original_language, target_language);
+}
+
+void OptionsMenuModel::Init(const string16& original_language,
+ const string16& target_language) {
AddCheckItem(IDC_TRANSLATE_OPTIONS_ALWAYS,
l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_OPTIONS_ALWAYS,
original_language, target_language));
@@ -32,4 +49,3 @@ OptionsMenuModel::OptionsMenuModel(menus::SimpleMenuModel::Delegate* delegate,
OptionsMenuModel::~OptionsMenuModel() {
}
-
« no previous file with comments | « chrome/browser/translate/options_menu_model.h ('k') | chrome/browser/translate/options_menu_model2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698