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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

Issue 16025007: Refacotring: fix styles of i18n-content names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug fix Created 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/options/chromeos/cros_language_options_handler .h" 5 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 RemoveObserver(this); 66 RemoveObserver(this);
67 } 67 }
68 68
69 void CrosLanguageOptionsHandler::GetLocalizedValues( 69 void CrosLanguageOptionsHandler::GetLocalizedValues(
70 DictionaryValue* localized_strings) { 70 DictionaryValue* localized_strings) {
71 ::options::LanguageOptionsHandlerCommon::GetLocalizedValues( 71 ::options::LanguageOptionsHandlerCommon::GetLocalizedValues(
72 localized_strings); 72 localized_strings);
73 73
74 RegisterTitle(localized_strings, "languagePage", 74 RegisterTitle(localized_strings, "languagePage",
75 IDS_OPTIONS_SETTINGS_LANGUAGES_AND_INPUT_DIALOG_TITLE); 75 IDS_OPTIONS_SETTINGS_LANGUAGES_AND_INPUT_DIALOG_TITLE);
76 localized_strings->SetString("ok_button", l10n_util::GetStringUTF16(IDS_OK)); 76 localized_strings->SetString("okButton", l10n_util::GetStringUTF16(IDS_OK));
77 localized_strings->SetString("configure", 77 localized_strings->SetString("configure",
78 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_CONFIGURE)); 78 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_CONFIGURE));
79 localized_strings->SetString("input_method", 79 localized_strings->SetString("inputMethod",
80 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD)); 80 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD));
81 localized_strings->SetString("please_add_another_input_method", 81 localized_strings->SetString("pleaseAddAnotherInputMethod",
82 l10n_util::GetStringUTF16( 82 l10n_util::GetStringUTF16(
83 IDS_OPTIONS_SETTINGS_LANGUAGES_PLEASE_ADD_ANOTHER_INPUT_METHOD)); 83 IDS_OPTIONS_SETTINGS_LANGUAGES_PLEASE_ADD_ANOTHER_INPUT_METHOD));
84 localized_strings->SetString("input_method_instructions", 84 localized_strings->SetString("inputMethodInstructions",
85 l10n_util::GetStringUTF16( 85 l10n_util::GetStringUTF16(
86 IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_INSTRUCTIONS)); 86 IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_INSTRUCTIONS));
87 localized_strings->SetString("switch_input_methods_hint", 87 localized_strings->SetString("switchInputMethodsHint",
88 l10n_util::GetStringUTF16( 88 l10n_util::GetStringUTF16(
89 IDS_OPTIONS_SETTINGS_LANGUAGES_SWITCH_INPUT_METHODS_HINT)); 89 IDS_OPTIONS_SETTINGS_LANGUAGES_SWITCH_INPUT_METHODS_HINT));
90 localized_strings->SetString("select_previous_input_method_hint", 90 localized_strings->SetString("selectPreviousInputMethodHint",
91 l10n_util::GetStringUTF16( 91 l10n_util::GetStringUTF16(
92 IDS_OPTIONS_SETTINGS_LANGUAGES_SELECT_PREVIOUS_INPUT_METHOD_HINT)); 92 IDS_OPTIONS_SETTINGS_LANGUAGES_SELECT_PREVIOUS_INPUT_METHOD_HINT));
93 localized_strings->SetString("restart_button", 93 localized_strings->SetString("restartButton",
94 l10n_util::GetStringUTF16( 94 l10n_util::GetStringUTF16(
95 IDS_OPTIONS_SETTINGS_LANGUAGES_SIGN_OUT_BUTTON)); 95 IDS_OPTIONS_SETTINGS_LANGUAGES_SIGN_OUT_BUTTON));
96 localized_strings->SetString("extension_ime_label", 96 localized_strings->SetString("extensionImeLable",
97 l10n_util::GetStringUTF16( 97 l10n_util::GetStringUTF16(
98 IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_EXTENSION_IME)); 98 IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_EXTENSION_IME));
99 localized_strings->SetString("extension_ime_description", 99 localized_strings->SetString("extensionImeDescription",
100 l10n_util::GetStringUTF16( 100 l10n_util::GetStringUTF16(
101 IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_EXTENSION_DESCRIPTION)); 101 IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_EXTENSION_DESCRIPTION));
102 localized_strings->SetString("noInputMethods", 102 localized_strings->SetString("noInputMethods",
103 l10n_util::GetStringUTF16( 103 l10n_util::GetStringUTF16(
104 IDS_OPTIONS_SETTINGS_LANGUAGES_NO_INPUT_METHODS)); 104 IDS_OPTIONS_SETTINGS_LANGUAGES_NO_INPUT_METHODS));
105 105
106 input_method::InputMethodManager* manager = 106 input_method::InputMethodManager* manager =
107 input_method::InputMethodManager::Get(); 107 input_method::InputMethodManager::Get();
108 // GetSupportedInputMethods() never return NULL. 108 // GetSupportedInputMethods() never return NULL.
109 scoped_ptr<input_method::InputMethodDescriptors> descriptors( 109 scoped_ptr<input_method::InputMethodDescriptors> descriptors(
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 ConvertInputMethodDescriptosToIMEList( 401 ConvertInputMethodDescriptosToIMEList(
402 component_extension_manager->GetAllIMEAsInputMethodDescriptor())); 402 component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
403 web_ui()->CallJavascriptFunction( 403 web_ui()->CallJavascriptFunction(
404 "options.LanguageOptions.onComponentManagerInitialized", 404 "options.LanguageOptions.onComponentManagerInitialized",
405 *ime_list); 405 *ime_list);
406 composition_extension_appended_ = true; 406 composition_extension_appended_ = true;
407 } 407 }
408 408
409 } // namespace options 409 } // namespace options
410 } // namespace chromeos 410 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698