Chromium Code Reviews| 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 "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 157 IDS_NETWORK_SCREEN_ACCESSIBLE_TITLE); | 157 IDS_NETWORK_SCREEN_ACCESSIBLE_TITLE); |
| 158 builder->Add("selectLanguage", IDS_LANGUAGE_SELECTION_SELECT); | 158 builder->Add("selectLanguage", IDS_LANGUAGE_SELECTION_SELECT); |
| 159 builder->Add("selectKeyboard", IDS_KEYBOARD_SELECTION_SELECT); | 159 builder->Add("selectKeyboard", IDS_KEYBOARD_SELECTION_SELECT); |
| 160 builder->Add("selectNetwork", IDS_NETWORK_SELECTION_SELECT); | 160 builder->Add("selectNetwork", IDS_NETWORK_SELECTION_SELECT); |
| 161 builder->Add("selectTimezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION); | 161 builder->Add("selectTimezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION); |
| 162 builder->Add("proxySettings", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON); | 162 builder->Add("proxySettings", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON); |
| 163 builder->Add("continueButton", IDS_NETWORK_SELECTION_CONTINUE_BUTTON); | 163 builder->Add("continueButton", IDS_NETWORK_SELECTION_CONTINUE_BUTTON); |
| 164 builder->Add("debuggingFeaturesLink", IDS_NETWORK_ENABLE_DEV_FEATURES_LINK); | 164 builder->Add("debuggingFeaturesLink", IDS_NETWORK_ENABLE_DEV_FEATURES_LINK); |
| 165 | 165 |
| 166 // MD-OOBE | 166 // MD-OOBE |
| 167 builder->Add("OobeOKButtonText", IDS_OOBE_OK_BUTTON_TEXT); | |
|
stevenjb
2016/07/29 16:11:53
oobeOKButtonText
Alexander Alekseev
2016/08/01 22:21:43
Done.
| |
| 168 builder->Add("languageSectionTitle", IDS_LANGUAGE_SECTION_TITE); | |
| 167 builder->Add("networkSectionTitle", IDS_NETWORK_SECTION_TITE); | 169 builder->Add("networkSectionTitle", IDS_NETWORK_SECTION_TITE); |
| 168 builder->Add("networkSectionHint", IDS_NETWORK_SECTION_HINT); | 170 builder->Add("networkSectionHint", IDS_NETWORK_SECTION_HINT); |
| 171 | |
| 172 builder->Add("languageDropdownTitle", IDS_LANGUAGE_DROPDOWN_TITLE); | |
| 173 builder->Add("keyboardDropdownTitle", IDS_KEYBOARD_DROPDOWN_TITLE); | |
| 169 builder->Add("proxySettingsMenuName", IDS_PROXY_SETTINGS_MENU_NAME); | 174 builder->Add("proxySettingsMenuName", IDS_PROXY_SETTINGS_MENU_NAME); |
| 170 builder->Add("addWiFiNetworkMenuName", IDS_ADD_WI_FI_NETWORK_MENU_NAME); | 175 builder->Add("addWiFiNetworkMenuName", IDS_ADD_WI_FI_NETWORK_MENU_NAME); |
| 171 builder->Add("addMobileNetworkMenuName", IDS_ADD_MOBILE_NETWORK_MENU_NAME); | 176 builder->Add("addMobileNetworkMenuName", IDS_ADD_MOBILE_NETWORK_MENU_NAME); |
| 172 } | 177 } |
| 173 | 178 |
| 174 void NetworkScreenHandler::GetAdditionalParameters( | 179 void NetworkScreenHandler::GetAdditionalParameters( |
| 175 base::DictionaryValue* dict) { | 180 base::DictionaryValue* dict) { |
| 176 const std::string application_locale = | 181 const std::string application_locale = |
| 177 g_browser_process->GetApplicationLocale(); | 182 g_browser_process->GetApplicationLocale(); |
| 178 const std::string selected_input_method = | 183 const std::string selected_input_method = |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 267 timezone_option->SetString("value", timezone_id); | 272 timezone_option->SetString("value", timezone_id); |
| 268 timezone_option->SetString("title", timezone_name); | 273 timezone_option->SetString("title", timezone_name); |
| 269 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); | 274 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); |
| 270 timezone_list->Append(timezone_option.release()); | 275 timezone_list->Append(timezone_option.release()); |
| 271 } | 276 } |
| 272 | 277 |
| 273 return timezone_list.release(); | 278 return timezone_list.release(); |
| 274 } | 279 } |
| 275 | 280 |
| 276 } // namespace chromeos | 281 } // namespace chromeos |
| OLD | NEW |