| OLD | NEW |
| 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/chromeos/login/network_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 builder->Add("proxySettings", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON); | 159 builder->Add("proxySettings", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON); |
| 160 builder->Add("continueButton", IDS_NETWORK_SELECTION_CONTINUE_BUTTON); | 160 builder->Add("continueButton", IDS_NETWORK_SELECTION_CONTINUE_BUTTON); |
| 161 builder->Add("debuggingFeaturesLink", IDS_NETWORK_ENABLE_DEV_FEATURES_LINK); | 161 builder->Add("debuggingFeaturesLink", IDS_NETWORK_ENABLE_DEV_FEATURES_LINK); |
| 162 | 162 |
| 163 // MD-OOBE | 163 // MD-OOBE |
| 164 builder->Add("oobeOKButtonText", IDS_OOBE_OK_BUTTON_TEXT); | 164 builder->Add("oobeOKButtonText", IDS_OOBE_OK_BUTTON_TEXT); |
| 165 builder->Add("welcomeNextButtonText", IDS_OOBE_WELCOME_NEXT_BUTTON_TEXT); | 165 builder->Add("welcomeNextButtonText", IDS_OOBE_WELCOME_NEXT_BUTTON_TEXT); |
| 166 builder->Add("languageSectionTitle", IDS_LANGUAGE_SECTION_TITLE); | 166 builder->Add("languageSectionTitle", IDS_LANGUAGE_SECTION_TITLE); |
| 167 builder->Add("accessibilitySectionTitle", IDS_ACCESSIBILITY_SECTION_TITLE); | 167 builder->Add("accessibilitySectionTitle", IDS_ACCESSIBILITY_SECTION_TITLE); |
| 168 builder->Add("accessibilitySectionHint", IDS_ACCESSIBILITY_SECTION_HINT); | 168 builder->Add("accessibilitySectionHint", IDS_ACCESSIBILITY_SECTION_HINT); |
| 169 builder->Add("timezoneSectionTitle", IDS_TIMEZONE_SECTION_TITLE); |
| 169 builder->Add("networkSectionTitle", IDS_NETWORK_SECTION_TITLE); | 170 builder->Add("networkSectionTitle", IDS_NETWORK_SECTION_TITLE); |
| 170 builder->Add("networkSectionHint", IDS_NETWORK_SECTION_HINT); | 171 builder->Add("networkSectionHint", IDS_NETWORK_SECTION_HINT); |
| 171 | 172 |
| 172 builder->Add("languageDropdownTitle", IDS_LANGUAGE_DROPDOWN_TITLE); | 173 builder->Add("languageDropdownTitle", IDS_LANGUAGE_DROPDOWN_TITLE); |
| 173 builder->Add("keyboardDropdownTitle", IDS_KEYBOARD_DROPDOWN_TITLE); | 174 builder->Add("keyboardDropdownTitle", IDS_KEYBOARD_DROPDOWN_TITLE); |
| 174 builder->Add("proxySettingsMenuName", IDS_PROXY_SETTINGS_MENU_NAME); | 175 builder->Add("proxySettingsMenuName", IDS_PROXY_SETTINGS_MENU_NAME); |
| 175 builder->Add("addWiFiNetworkMenuName", IDS_ADD_WI_FI_NETWORK_MENU_NAME); | 176 builder->Add("addWiFiNetworkMenuName", IDS_ADD_WI_FI_NETWORK_MENU_NAME); |
| 176 builder->Add("addMobileNetworkMenuName", IDS_ADD_MOBILE_NETWORK_MENU_NAME); | 177 builder->Add("addMobileNetworkMenuName", IDS_ADD_MOBILE_NETWORK_MENU_NAME); |
| 177 | 178 |
| 178 builder->Add("highContrastOptionOff", IDS_HIGH_CONTRAST_OPTION_OFF); | 179 builder->Add("highContrastOptionOff", IDS_HIGH_CONTRAST_OPTION_OFF); |
| 179 builder->Add("highContrastOptionOn", IDS_HIGH_CONTRAST_OPTION_ON); | 180 builder->Add("highContrastOptionOn", IDS_HIGH_CONTRAST_OPTION_ON); |
| 180 builder->Add("largeCursorOptionOff", IDS_LARGE_CURSOR_OPTION_OFF); | 181 builder->Add("largeCursorOptionOff", IDS_LARGE_CURSOR_OPTION_OFF); |
| 181 builder->Add("largeCursorOptionOn", IDS_LARGE_CURSOR_OPTION_ON); | 182 builder->Add("largeCursorOptionOn", IDS_LARGE_CURSOR_OPTION_ON); |
| 182 builder->Add("screenMagnifierOptionOff", IDS_SCREEN_MAGNIFIER_OPTION_OFF); | 183 builder->Add("screenMagnifierOptionOff", IDS_SCREEN_MAGNIFIER_OPTION_OFF); |
| 183 builder->Add("screenMagnifierOptionOn", IDS_SCREEN_MAGNIFIER_OPTION_ON); | 184 builder->Add("screenMagnifierOptionOn", IDS_SCREEN_MAGNIFIER_OPTION_ON); |
| 184 builder->Add("spokenFeedbackOptionOff", IDS_SPOKEN_FEEDBACK_OPTION_OFF); | 185 builder->Add("spokenFeedbackOptionOff", IDS_SPOKEN_FEEDBACK_OPTION_OFF); |
| 185 builder->Add("spokenFeedbackOptionOn", IDS_SPOKEN_FEEDBACK_OPTION_ON); | 186 builder->Add("spokenFeedbackOptionOn", IDS_SPOKEN_FEEDBACK_OPTION_ON); |
| 186 builder->Add("virtualKeyboardOptionOff", IDS_VIRTUAL_KEYBOARD_OPTION_OFF); | 187 builder->Add("virtualKeyboardOptionOff", IDS_VIRTUAL_KEYBOARD_OPTION_OFF); |
| 187 builder->Add("virtualKeyboardOptionOn", IDS_VIRTUAL_KEYBOARD_OPTION_ON); | 188 builder->Add("virtualKeyboardOptionOn", IDS_VIRTUAL_KEYBOARD_OPTION_ON); |
| 189 |
| 190 builder->Add("timezoneDropdownTitle", IDS_TIMEZONE_DROPDOWN_TITLE); |
| 191 builder->Add("timezoneButtonText", IDS_TIMEZONE_BUTTON_TEXT); |
| 188 } | 192 } |
| 189 | 193 |
| 190 void NetworkScreenHandler::GetAdditionalParameters( | 194 void NetworkScreenHandler::GetAdditionalParameters( |
| 191 base::DictionaryValue* dict) { | 195 base::DictionaryValue* dict) { |
| 192 const std::string application_locale = | 196 const std::string application_locale = |
| 193 g_browser_process->GetApplicationLocale(); | 197 g_browser_process->GetApplicationLocale(); |
| 194 const std::string selected_input_method = | 198 const std::string selected_input_method = |
| 195 input_method::InputMethodManager::Get() | 199 input_method::InputMethodManager::Get() |
| 196 ->GetActiveIMEState() | 200 ->GetActiveIMEState() |
| 197 ->GetCurrentInputMethod() | 201 ->GetCurrentInputMethod() |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 timezone_option->SetString("value", timezone_id); | 287 timezone_option->SetString("value", timezone_id); |
| 284 timezone_option->SetString("title", timezone_name); | 288 timezone_option->SetString("title", timezone_name); |
| 285 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); | 289 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); |
| 286 timezone_list->Append(std::move(timezone_option)); | 290 timezone_list->Append(std::move(timezone_option)); |
| 287 } | 291 } |
| 288 | 292 |
| 289 return timezone_list.release(); | 293 return timezone_list.release(); |
| 290 } | 294 } |
| 291 | 295 |
| 292 } // namespace chromeos | 296 } // namespace chromeos |
| OLD | NEW |