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

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

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month 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"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 .ptr(); 80 .ptr();
81 content::WebContents* web_contents = 81 content::WebContents* web_contents =
82 content::Source<content::WebContents>(source).ptr(); 82 content::Source<content::WebContents>(source).ptr();
83 83
84 if (web_contents->GetBrowserContext()->IsOffTheRecord() || 84 if (web_contents->GetBrowserContext()->IsOffTheRecord() ||
85 !TranslateService::IsTranslatableURL(language_detection_details->url)) { 85 !TranslateService::IsTranslatableURL(language_detection_details->url)) {
86 return; 86 return;
87 } 87 }
88 88
89 base::DictionaryValue dict; 89 base::DictionaryValue dict;
90 dict.Set("time", new base::FundamentalValue( 90 dict.Set("time", new base::Value(
91 language_detection_details->time.ToJsTime())); 91 language_detection_details->time.ToJsTime()));
92 dict.Set("url", 92 dict.Set("url",
93 new base::StringValue(language_detection_details->url.spec())); 93 new base::StringValue(language_detection_details->url.spec()));
94 dict.Set("content_language", 94 dict.Set("content_language",
95 new base::StringValue(language_detection_details->content_language)); 95 new base::StringValue(language_detection_details->content_language));
96 dict.Set("cld_language", 96 dict.Set("cld_language",
97 new base::StringValue(language_detection_details->cld_language)); 97 new base::StringValue(language_detection_details->cld_language));
98 dict.Set("is_cld_reliable", new base::FundamentalValue( 98 dict.Set("is_cld_reliable", new base::Value(
99 language_detection_details->is_cld_reliable)); 99 language_detection_details->is_cld_reliable));
100 dict.Set("has_notranslate", new base::FundamentalValue( 100 dict.Set("has_notranslate", new base::Value(
101 language_detection_details->has_notranslate)); 101 language_detection_details->has_notranslate));
102 dict.Set( 102 dict.Set(
103 "html_root_language", 103 "html_root_language",
104 new base::StringValue(language_detection_details->html_root_language)); 104 new base::StringValue(language_detection_details->html_root_language));
105 dict.Set("adopted_language", 105 dict.Set("adopted_language",
106 new base::StringValue(language_detection_details->adopted_language)); 106 new base::StringValue(language_detection_details->adopted_language));
107 dict.Set("content", 107 dict.Set("content",
108 new base::StringValue(language_detection_details->contents)); 108 new base::StringValue(language_detection_details->contents));
109 SendMessageToJs("languageDetectionInfoAdded", dict); 109 SendMessageToJs("languageDetectionInfoAdded", dict);
110 } 110 }
111 111
112 void TranslateInternalsHandler::OnTranslateError( 112 void TranslateInternalsHandler::OnTranslateError(
113 const translate::TranslateErrorDetails& details) { 113 const translate::TranslateErrorDetails& details) {
114 base::DictionaryValue dict; 114 base::DictionaryValue dict;
115 dict.Set("time", new base::FundamentalValue(details.time.ToJsTime())); 115 dict.Set("time", new base::Value(details.time.ToJsTime()));
116 dict.Set("url", new base::StringValue(details.url.spec())); 116 dict.Set("url", new base::StringValue(details.url.spec()));
117 dict.Set("error", new base::FundamentalValue(details.error)); 117 dict.Set("error", new base::Value(details.error));
118 SendMessageToJs("translateErrorDetailsAdded", dict); 118 SendMessageToJs("translateErrorDetailsAdded", dict);
119 } 119 }
120 120
121 void TranslateInternalsHandler::OnTranslateEvent( 121 void TranslateInternalsHandler::OnTranslateEvent(
122 const translate::TranslateEventDetails& details) { 122 const translate::TranslateEventDetails& details) {
123 base::DictionaryValue dict; 123 base::DictionaryValue dict;
124 dict.Set("time", new base::FundamentalValue(details.time.ToJsTime())); 124 dict.Set("time", new base::Value(details.time.ToJsTime()));
125 dict.Set("filename", new base::StringValue(details.filename)); 125 dict.Set("filename", new base::StringValue(details.filename));
126 dict.Set("line", new base::FundamentalValue(details.line)); 126 dict.Set("line", new base::Value(details.line));
127 dict.Set("message", new base::StringValue(details.message)); 127 dict.Set("message", new base::StringValue(details.message));
128 SendMessageToJs("translateEventDetailsAdded", dict); 128 SendMessageToJs("translateEventDetailsAdded", dict);
129 } 129 }
130 130
131 void TranslateInternalsHandler::OnRemovePrefItem(const base::ListValue* args) { 131 void TranslateInternalsHandler::OnRemovePrefItem(const base::ListValue* args) {
132 content::WebContents* web_contents = web_ui()->GetWebContents(); 132 content::WebContents* web_contents = web_ui()->GetWebContents();
133 Profile* profile = 133 Profile* profile =
134 Profile::FromBrowserContext(web_contents->GetBrowserContext()); 134 Profile::FromBrowserContext(web_contents->GetBrowserContext());
135 PrefService* prefs = profile->GetOriginalProfile()->GetPrefs(); 135 PrefService* prefs = profile->GetOriginalProfile()->GetPrefs();
136 std::unique_ptr<translate::TranslatePrefs> translate_prefs( 136 std::unique_ptr<translate::TranslatePrefs> translate_prefs(
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 for (std::vector<std::string>::iterator it = languages.begin(); 232 for (std::vector<std::string>::iterator it = languages.begin();
233 it != languages.end(); ++it) { 233 it != languages.end(); ++it) {
234 const std::string& lang = *it; 234 const std::string& lang = *it;
235 languages_list->AppendString(lang); 235 languages_list->AppendString(lang);
236 if (translate::TranslateDownloadManager::IsAlphaLanguage(lang)) 236 if (translate::TranslateDownloadManager::IsAlphaLanguage(lang))
237 alpha_languages_list->AppendString(lang); 237 alpha_languages_list->AppendString(lang);
238 } 238 }
239 239
240 dict.Set("languages", languages_list); 240 dict.Set("languages", languages_list);
241 dict.Set("alpha_languages", alpha_languages_list); 241 dict.Set("alpha_languages", alpha_languages_list);
242 dict.Set("last_updated", new base::FundamentalValue(last_updated.ToJsTime())); 242 dict.Set("last_updated", new base::Value(last_updated.ToJsTime()));
243 SendMessageToJs("supportedLanguagesUpdated", dict); 243 SendMessageToJs("supportedLanguagesUpdated", dict);
244 } 244 }
245 245
246 void TranslateInternalsHandler::SendCountryToJs(bool was_updated) { 246 void TranslateInternalsHandler::SendCountryToJs(bool was_updated) {
247 std::string country; 247 std::string country;
248 variations::VariationsService* variations_service = 248 variations::VariationsService* variations_service =
249 g_browser_process->variations_service(); 249 g_browser_process->variations_service();
250 if (variations_service) 250 if (variations_service)
251 country = variations_service->GetStoredPermanentCountry(); 251 country = variations_service->GetStoredPermanentCountry();
252 252
253 base::DictionaryValue dict; 253 base::DictionaryValue dict;
254 if (!country.empty()) { 254 if (!country.empty()) {
255 dict.Set("country", new base::StringValue(country)); 255 dict.Set("country", new base::StringValue(country));
256 dict.Set("update", new base::FundamentalValue(was_updated)); 256 dict.Set("update", new base::Value(was_updated));
257 } 257 }
258 SendMessageToJs("countryUpdated", dict); 258 SendMessageToJs("countryUpdated", dict);
259 } 259 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/sync_internals_ui_unittest.cc ('k') | chrome/browser/ui/webui/welcome_win10_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698