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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Issue 2067153002: ChromeOS: Implement Network Selection screen of material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted change to web_ui_browser_test.cc that was moved to another CL. Created 4 years, 5 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/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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 builder->Add("networkScreenTitle", IDS_WELCOME_SCREEN_TITLE); 155 builder->Add("networkScreenTitle", IDS_WELCOME_SCREEN_TITLE);
156 builder->Add("networkScreenAccessibleTitle", 156 builder->Add("networkScreenAccessibleTitle",
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
166 // MD-OOBE
167 builder->Add("networkSectionTitle", IDS_NETWORK_SECTION_TITE);
168 builder->Add("networkSectionHint", IDS_NETWORK_SECTION_HINT);
169 builder->Add("proxySettingsMenuName", IDS_PROXY_SETTINGS_MENU_NAME);
170 builder->Add("addWiFiNetworkMenuName", IDS_ADD_WI_FI_NETWORK_MENU_NAME);
171 builder->Add("addMobileNetworkMenuName", IDS_ADD_MOBILE_NETWORK_MENU_NAME);
165 } 172 }
166 173
167 void NetworkScreenHandler::GetAdditionalParameters( 174 void NetworkScreenHandler::GetAdditionalParameters(
168 base::DictionaryValue* dict) { 175 base::DictionaryValue* dict) {
169 const std::string application_locale = 176 const std::string application_locale =
170 g_browser_process->GetApplicationLocale(); 177 g_browser_process->GetApplicationLocale();
171 const std::string selected_input_method = 178 const std::string selected_input_method =
172 input_method::InputMethodManager::Get() 179 input_method::InputMethodManager::Get()
173 ->GetActiveIMEState() 180 ->GetActiveIMEState()
174 ->GetCurrentInputMethod() 181 ->GetCurrentInputMethod()
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 timezone_option->SetString("value", timezone_id); 267 timezone_option->SetString("value", timezone_id);
261 timezone_option->SetString("title", timezone_name); 268 timezone_option->SetString("title", timezone_name);
262 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); 269 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
263 timezone_list->Append(timezone_option.release()); 270 timezone_list->Append(timezone_option.release());
264 } 271 }
265 272
266 return timezone_list.release(); 273 return timezone_list.release();
267 } 274 }
268 275
269 } // namespace chromeos 276 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698