| Index: chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
|
| diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
|
| index f885e4db7120f9b01e7230ddb6af146e9e1f9c82..93b8160da741e48c9b176801f1f6fe793166e7b0 100644
|
| --- a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
|
| +++ b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
|
| @@ -58,10 +58,12 @@ TranslateInternalsHandler::~TranslateInternalsHandler() {
|
| }
|
|
|
| void TranslateInternalsHandler::RegisterMessages() {
|
| - web_ui()->RegisterMessageCallback("removePrefItem", base::Bind(
|
| - &TranslateInternalsHandler::OnRemovePrefItem, base::Unretained(this)));
|
| - web_ui()->RegisterMessageCallback("requestInfo", base::Bind(
|
| - &TranslateInternalsHandler::OnRequestInfo, base::Unretained(this)));
|
| + web_ui()->RegisterMessageCallback(
|
| + "removePrefItem", base::Bind(&TranslateInternalsHandler::OnRemovePrefItem,
|
| + base::Unretained(this)));
|
| + web_ui()->RegisterMessageCallback(
|
| + "requestInfo", base::Bind(&TranslateInternalsHandler::OnRequestInfo,
|
| + base::Unretained(this)));
|
| web_ui()->RegisterMessageCallback(
|
| "overrideCountry",
|
| base::Bind(&TranslateInternalsHandler::OnOverrideCountry,
|
| @@ -85,21 +87,18 @@ void TranslateInternalsHandler::Observe(
|
| }
|
|
|
| base::DictionaryValue dict;
|
| - dict.Set(
|
| - "time",
|
| - new base::FundamentalValue(language_detection_details->time.ToJsTime()));
|
| + dict.Set("time", new base::FundamentalValue(
|
| + language_detection_details->time.ToJsTime()));
|
| dict.Set("url",
|
| new base::StringValue(language_detection_details->url.spec()));
|
| dict.Set("content_language",
|
| new base::StringValue(language_detection_details->content_language));
|
| dict.Set("cld_language",
|
| new base::StringValue(language_detection_details->cld_language));
|
| - dict.Set(
|
| - "is_cld_reliable",
|
| - new base::FundamentalValue(language_detection_details->is_cld_reliable));
|
| - dict.Set(
|
| - "has_notranslate",
|
| - new base::FundamentalValue(language_detection_details->has_notranslate));
|
| + dict.Set("is_cld_reliable", new base::FundamentalValue(
|
| + language_detection_details->is_cld_reliable));
|
| + dict.Set("has_notranslate", new base::FundamentalValue(
|
| + language_detection_details->has_notranslate));
|
| dict.Set(
|
| "html_root_language",
|
| new base::StringValue(language_detection_details->html_root_language));
|
| @@ -113,12 +112,9 @@ void TranslateInternalsHandler::Observe(
|
| void TranslateInternalsHandler::OnTranslateError(
|
| const translate::TranslateErrorDetails& details) {
|
| base::DictionaryValue dict;
|
| - dict.Set("time",
|
| - new base::FundamentalValue(details.time.ToJsTime()));
|
| - dict.Set("url",
|
| - new base::StringValue(details.url.spec()));
|
| - dict.Set("error",
|
| - new base::FundamentalValue(details.error));
|
| + dict.Set("time", new base::FundamentalValue(details.time.ToJsTime()));
|
| + dict.Set("url", new base::StringValue(details.url.spec()));
|
| + dict.Set("error", new base::FundamentalValue(details.error));
|
| SendMessageToJs("translateErrorDetailsAdded", dict);
|
| }
|
|
|
| @@ -209,14 +205,15 @@ void TranslateInternalsHandler::SendPrefsToJs() {
|
| base::DictionaryValue dict;
|
|
|
| static const char* keys[] = {
|
| - prefs::kEnableTranslate,
|
| - translate::TranslatePrefs::kPrefTranslateBlockedLanguages,
|
| - translate::TranslatePrefs::kPrefTranslateSiteBlacklist,
|
| - translate::TranslatePrefs::kPrefTranslateWhitelists,
|
| - translate::TranslatePrefs::kPrefTranslateDeniedCount,
|
| - translate::TranslatePrefs::kPrefTranslateAcceptedCount,
|
| - translate::TranslatePrefs::kPrefTranslateLastDeniedTimeForLanguage,
|
| - translate::TranslatePrefs::kPrefTranslateTooOftenDeniedForLanguage,
|
| + prefs::kEnableTranslate,
|
| + translate::TranslatePrefs::kPrefTranslateBlockedLanguages,
|
| + translate::TranslatePrefs::kPrefTranslateSiteBlacklist,
|
| + translate::TranslatePrefs::kPrefTranslateWhitelists,
|
| + translate::TranslatePrefs::kPrefTranslateDeniedCount,
|
| + translate::TranslatePrefs::kPrefTranslateIgnoredCount,
|
| + translate::TranslatePrefs::kPrefTranslateAcceptedCount,
|
| + translate::TranslatePrefs::kPrefTranslateLastDeniedTimeForLanguage,
|
| + translate::TranslatePrefs::kPrefTranslateTooOftenDeniedForLanguage,
|
| };
|
| for (const char* key : keys) {
|
| const PrefService::Preference* pref = prefs->FindPreference(key);
|
| @@ -247,8 +244,7 @@ void TranslateInternalsHandler::SendSupportedLanguagesToJs() {
|
|
|
| dict.Set("languages", languages_list);
|
| dict.Set("alpha_languages", alpha_languages_list);
|
| - dict.Set("last_updated",
|
| - new base::FundamentalValue(last_updated.ToJsTime()));
|
| + dict.Set("last_updated", new base::FundamentalValue(last_updated.ToJsTime()));
|
| SendMessageToJs("supportedLanguagesUpdated", dict);
|
| }
|
|
|
|
|