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

Side by Side Diff: chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc

Issue 23708004: Translate: Remove --enable-translate-settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modify TranslateManagerBrowserTest.NeverTranslateLanguagePref Created 7 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/translate_internals/translate_internals_handle r.h" 5 #include "chrome/browser/ui/webui/translate_internals/translate_internals_handle r.h"
6 6
7 #include <map> 7 #include <map>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/command_line.h"
13 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
14 #include "base/values.h" 13 #include "base/values.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/translate/translate_error_details.h" 15 #include "chrome/browser/translate/translate_error_details.h"
17 #include "chrome/browser/translate/translate_event_details.h" 16 #include "chrome/browser/translate/translate_event_details.h"
18 #include "chrome/browser/translate/translate_prefs.h" 17 #include "chrome/browser/translate/translate_prefs.h"
19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
21 #include "chrome/common/translate/language_detection_details.h" 19 #include "chrome/common/translate/language_detection_details.h"
22 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
23 #include "content/public/browser/web_ui.h" 21 #include "content/public/browser/web_ui.h"
24 22
25 TranslateInternalsHandler::TranslateInternalsHandler() { 23 TranslateInternalsHandler::TranslateInternalsHandler() {
26 TranslateManager::GetInstance()->AddObserver(this); 24 TranslateManager::GetInstance()->AddObserver(this);
27 } 25 }
28 26
29 TranslateInternalsHandler::~TranslateInternalsHandler() { 27 TranslateInternalsHandler::~TranslateInternalsHandler() {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 content::WebContents* web_contents = web_ui()->GetWebContents(); 137 content::WebContents* web_contents = web_ui()->GetWebContents();
140 Profile* profile = 138 Profile* profile =
141 Profile::FromBrowserContext(web_contents->GetBrowserContext()); 139 Profile::FromBrowserContext(web_contents->GetBrowserContext());
142 PrefService* prefs = profile->GetOriginalProfile()->GetPrefs(); 140 PrefService* prefs = profile->GetOriginalProfile()->GetPrefs();
143 141
144 base::DictionaryValue dict; 142 base::DictionaryValue dict;
145 143
146 std::vector<std::string> keys; 144 std::vector<std::string> keys;
147 keys.push_back(prefs::kEnableTranslate); 145 keys.push_back(prefs::kEnableTranslate);
148 146
149 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 147 keys.push_back(TranslatePrefs::kPrefTranslateBlockedLanguages);
150 bool enable_translate_settings =
151 command_line.HasSwitch(switches::kEnableTranslateSettings);
152 if (enable_translate_settings)
153 keys.push_back(TranslatePrefs::kPrefTranslateBlockedLanguages);
154
155 keys.push_back(TranslatePrefs::kPrefTranslateLanguageBlacklist); 148 keys.push_back(TranslatePrefs::kPrefTranslateLanguageBlacklist);
156 keys.push_back(TranslatePrefs::kPrefTranslateSiteBlacklist); 149 keys.push_back(TranslatePrefs::kPrefTranslateSiteBlacklist);
157 keys.push_back(TranslatePrefs::kPrefTranslateWhitelists); 150 keys.push_back(TranslatePrefs::kPrefTranslateWhitelists);
158 keys.push_back(TranslatePrefs::kPrefTranslateDeniedCount); 151 keys.push_back(TranslatePrefs::kPrefTranslateDeniedCount);
159 keys.push_back(TranslatePrefs::kPrefTranslateAcceptedCount); 152 keys.push_back(TranslatePrefs::kPrefTranslateAcceptedCount);
160 153
161 for (std::vector<std::string>::const_iterator it = keys.begin(); 154 for (std::vector<std::string>::const_iterator it = keys.begin();
162 it != keys.end(); ++it) { 155 it != keys.end(); ++it) {
163 const std::string& key = *it; 156 const std::string& key = *it;
164 const PrefService::Preference* pref = prefs->FindPreference(key.c_str()); 157 const PrefService::Preference* pref = prefs->FindPreference(key.c_str());
(...skipping 21 matching lines...) Expand all
186 if (TranslateManager::IsAlphaLanguage(lang)) 179 if (TranslateManager::IsAlphaLanguage(lang))
187 alpha_languages_list->Append(new StringValue(lang)); 180 alpha_languages_list->Append(new StringValue(lang));
188 } 181 }
189 182
190 dict.Set("languages", languages_list); 183 dict.Set("languages", languages_list);
191 dict.Set("alpha_languages", alpha_languages_list); 184 dict.Set("alpha_languages", alpha_languages_list);
192 dict.Set("last_updated", 185 dict.Set("last_updated",
193 new base::FundamentalValue(last_updated.ToJsTime())); 186 new base::FundamentalValue(last_updated.ToJsTime()));
194 SendMessageToJs("supportedLanguagesUpdated", dict); 187 SendMessageToJs("supportedLanguagesUpdated", dict);
195 } 188 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698