OLD | NEW |
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 <utility> |
8 #include <vector> | 9 #include <vector> |
9 | 10 |
10 #include "base/bind.h" | 11 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
| 13 #include "base/memory/ptr_util.h" |
12 #include "base/values.h" | 14 #include "base/values.h" |
13 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
14 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
15 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/translate/chrome_translate_client.h" | 18 #include "chrome/browser/translate/chrome_translate_client.h" |
17 #include "chrome/browser/translate/translate_service.h" | 19 #include "chrome/browser/translate/translate_service.h" |
18 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
19 #include "components/prefs/pref_service.h" | 21 #include "components/prefs/pref_service.h" |
20 #include "components/translate/core/browser/translate_download_manager.h" | 22 #include "components/translate/core/browser/translate_download_manager.h" |
21 #include "components/translate/core/browser/translate_error_details.h" | 23 #include "components/translate/core/browser/translate_error_details.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 .ptr(); | 82 .ptr(); |
81 content::WebContents* web_contents = | 83 content::WebContents* web_contents = |
82 content::Source<content::WebContents>(source).ptr(); | 84 content::Source<content::WebContents>(source).ptr(); |
83 | 85 |
84 if (web_contents->GetBrowserContext()->IsOffTheRecord() || | 86 if (web_contents->GetBrowserContext()->IsOffTheRecord() || |
85 !TranslateService::IsTranslatableURL(language_detection_details->url)) { | 87 !TranslateService::IsTranslatableURL(language_detection_details->url)) { |
86 return; | 88 return; |
87 } | 89 } |
88 | 90 |
89 base::DictionaryValue dict; | 91 base::DictionaryValue dict; |
90 dict.Set("time", | 92 dict.SetDouble("time", language_detection_details->time.ToJsTime()); |
91 new base::Value(language_detection_details->time.ToJsTime())); | 93 dict.SetString("url", language_detection_details->url.spec()); |
92 dict.Set("url", new base::Value(language_detection_details->url.spec())); | 94 dict.SetString("content_language", |
93 dict.Set("content_language", | 95 language_detection_details->content_language); |
94 new base::Value(language_detection_details->content_language)); | 96 dict.SetString("cld_language", language_detection_details->cld_language); |
95 dict.Set("cld_language", | 97 dict.SetBoolean("is_cld_reliable", |
96 new base::Value(language_detection_details->cld_language)); | 98 language_detection_details->is_cld_reliable); |
97 dict.Set("is_cld_reliable", | 99 dict.SetBoolean("has_notranslate", |
98 new base::Value(language_detection_details->is_cld_reliable)); | 100 language_detection_details->has_notranslate); |
99 dict.Set("has_notranslate", | 101 dict.SetString("html_root_language", |
100 new base::Value(language_detection_details->has_notranslate)); | 102 language_detection_details->html_root_language); |
101 dict.Set("html_root_language", | 103 dict.SetString("adopted_language", |
102 new base::Value(language_detection_details->html_root_language)); | 104 language_detection_details->adopted_language); |
103 dict.Set("adopted_language", | 105 dict.SetString("content", language_detection_details->contents); |
104 new base::Value(language_detection_details->adopted_language)); | |
105 dict.Set("content", new base::Value(language_detection_details->contents)); | |
106 SendMessageToJs("languageDetectionInfoAdded", dict); | 106 SendMessageToJs("languageDetectionInfoAdded", dict); |
107 } | 107 } |
108 | 108 |
109 void TranslateInternalsHandler::OnTranslateError( | 109 void TranslateInternalsHandler::OnTranslateError( |
110 const translate::TranslateErrorDetails& details) { | 110 const translate::TranslateErrorDetails& details) { |
111 base::DictionaryValue dict; | 111 base::DictionaryValue dict; |
112 dict.Set("time", new base::Value(details.time.ToJsTime())); | 112 dict.SetDouble("time", details.time.ToJsTime()); |
113 dict.Set("url", new base::Value(details.url.spec())); | 113 dict.SetString("url", details.url.spec()); |
114 dict.Set("error", new base::Value(details.error)); | 114 dict.SetInteger("error", details.error); |
115 SendMessageToJs("translateErrorDetailsAdded", dict); | 115 SendMessageToJs("translateErrorDetailsAdded", dict); |
116 } | 116 } |
117 | 117 |
118 void TranslateInternalsHandler::OnTranslateEvent( | 118 void TranslateInternalsHandler::OnTranslateEvent( |
119 const translate::TranslateEventDetails& details) { | 119 const translate::TranslateEventDetails& details) { |
120 base::DictionaryValue dict; | 120 base::DictionaryValue dict; |
121 dict.Set("time", new base::Value(details.time.ToJsTime())); | 121 dict.SetDouble("time", details.time.ToJsTime()); |
122 dict.Set("filename", new base::Value(details.filename)); | 122 dict.SetString("filename", details.filename); |
123 dict.Set("line", new base::Value(details.line)); | 123 dict.SetInteger("line", details.line); |
124 dict.Set("message", new base::Value(details.message)); | 124 dict.SetString("message", details.message); |
125 SendMessageToJs("translateEventDetailsAdded", dict); | 125 SendMessageToJs("translateEventDetailsAdded", dict); |
126 } | 126 } |
127 | 127 |
128 void TranslateInternalsHandler::OnRemovePrefItem(const base::ListValue* args) { | 128 void TranslateInternalsHandler::OnRemovePrefItem(const base::ListValue* args) { |
129 content::WebContents* web_contents = web_ui()->GetWebContents(); | 129 content::WebContents* web_contents = web_ui()->GetWebContents(); |
130 Profile* profile = | 130 Profile* profile = |
131 Profile::FromBrowserContext(web_contents->GetBrowserContext()); | 131 Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
132 PrefService* prefs = profile->GetOriginalProfile()->GetPrefs(); | 132 PrefService* prefs = profile->GetOriginalProfile()->GetPrefs(); |
133 std::unique_ptr<translate::TranslatePrefs> translate_prefs( | 133 std::unique_ptr<translate::TranslatePrefs> translate_prefs( |
134 ChromeTranslateClient::CreateTranslatePrefs(prefs)); | 134 ChromeTranslateClient::CreateTranslatePrefs(prefs)); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 translate::TranslatePrefs::kPrefTranslateWhitelists, | 203 translate::TranslatePrefs::kPrefTranslateWhitelists, |
204 translate::TranslatePrefs::kPrefTranslateDeniedCount, | 204 translate::TranslatePrefs::kPrefTranslateDeniedCount, |
205 translate::TranslatePrefs::kPrefTranslateIgnoredCount, | 205 translate::TranslatePrefs::kPrefTranslateIgnoredCount, |
206 translate::TranslatePrefs::kPrefTranslateAcceptedCount, | 206 translate::TranslatePrefs::kPrefTranslateAcceptedCount, |
207 translate::TranslatePrefs::kPrefTranslateLastDeniedTimeForLanguage, | 207 translate::TranslatePrefs::kPrefTranslateLastDeniedTimeForLanguage, |
208 translate::TranslatePrefs::kPrefTranslateTooOftenDeniedForLanguage, | 208 translate::TranslatePrefs::kPrefTranslateTooOftenDeniedForLanguage, |
209 }; | 209 }; |
210 for (const char* key : keys) { | 210 for (const char* key : keys) { |
211 const PrefService::Preference* pref = prefs->FindPreference(key); | 211 const PrefService::Preference* pref = prefs->FindPreference(key); |
212 if (pref) | 212 if (pref) |
213 dict.Set(key, pref->GetValue()->DeepCopy()); | 213 dict.Set(key, base::MakeUnique<base::Value>(*pref->GetValue())); |
214 } | 214 } |
215 | 215 |
216 SendMessageToJs("prefsUpdated", dict); | 216 SendMessageToJs("prefsUpdated", dict); |
217 } | 217 } |
218 | 218 |
219 void TranslateInternalsHandler::SendSupportedLanguagesToJs() { | 219 void TranslateInternalsHandler::SendSupportedLanguagesToJs() { |
220 base::DictionaryValue dict; | 220 base::DictionaryValue dict; |
221 | 221 |
222 std::vector<std::string> languages; | 222 std::vector<std::string> languages; |
223 translate::TranslateDownloadManager::GetSupportedLanguages(&languages); | 223 translate::TranslateDownloadManager::GetSupportedLanguages(&languages); |
224 base::Time last_updated = | 224 base::Time last_updated = |
225 translate::TranslateDownloadManager::GetSupportedLanguagesLastUpdated(); | 225 translate::TranslateDownloadManager::GetSupportedLanguagesLastUpdated(); |
226 | 226 |
227 base::ListValue* languages_list = new base::ListValue(); | 227 auto languages_list = base::MakeUnique<base::ListValue>(); |
228 base::ListValue* alpha_languages_list = new base::ListValue(); | 228 auto alpha_languages_list = base::MakeUnique<base::ListValue>(); |
229 for (std::vector<std::string>::iterator it = languages.begin(); | 229 for (std::vector<std::string>::iterator it = languages.begin(); |
230 it != languages.end(); ++it) { | 230 it != languages.end(); ++it) { |
231 const std::string& lang = *it; | 231 const std::string& lang = *it; |
232 languages_list->AppendString(lang); | 232 languages_list->AppendString(lang); |
233 if (translate::TranslateDownloadManager::IsAlphaLanguage(lang)) | 233 if (translate::TranslateDownloadManager::IsAlphaLanguage(lang)) |
234 alpha_languages_list->AppendString(lang); | 234 alpha_languages_list->AppendString(lang); |
235 } | 235 } |
236 | 236 |
237 dict.Set("languages", languages_list); | 237 dict.Set("languages", std::move(languages_list)); |
238 dict.Set("alpha_languages", alpha_languages_list); | 238 dict.Set("alpha_languages", std::move(alpha_languages_list)); |
239 dict.Set("last_updated", new base::Value(last_updated.ToJsTime())); | 239 dict.SetDouble("last_updated", last_updated.ToJsTime()); |
240 SendMessageToJs("supportedLanguagesUpdated", dict); | 240 SendMessageToJs("supportedLanguagesUpdated", dict); |
241 } | 241 } |
242 | 242 |
243 void TranslateInternalsHandler::SendCountryToJs(bool was_updated) { | 243 void TranslateInternalsHandler::SendCountryToJs(bool was_updated) { |
244 std::string country; | 244 std::string country; |
245 variations::VariationsService* variations_service = | 245 variations::VariationsService* variations_service = |
246 g_browser_process->variations_service(); | 246 g_browser_process->variations_service(); |
247 if (variations_service) | 247 if (variations_service) |
248 country = variations_service->GetStoredPermanentCountry(); | 248 country = variations_service->GetStoredPermanentCountry(); |
249 | 249 |
250 base::DictionaryValue dict; | 250 base::DictionaryValue dict; |
251 if (!country.empty()) { | 251 if (!country.empty()) { |
252 dict.Set("country", new base::Value(country)); | 252 dict.SetString("country", country); |
253 dict.Set("update", new base::Value(was_updated)); | 253 dict.SetBoolean("update", was_updated); |
254 } | 254 } |
255 SendMessageToJs("countryUpdated", dict); | 255 SendMessageToJs("countryUpdated", dict); |
256 } | 256 } |
OLD | NEW |