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

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

Issue 12213110: Implemented screen notifying users about malformed HWID. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Implemented wizard controller test. Created 7 years, 10 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 | Annotate | Revision Log
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/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" 25 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
26 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" 26 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
27 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h" 27 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
28 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" 28 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
29 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 29 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
30 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 30 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
31 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 31 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
32 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler .h" 32 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler .h"
33 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h" 33 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
34 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h" 34 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
35 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h"
35 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 36 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
36 #include "chrome/browser/ui/webui/theme_source.h" 37 #include "chrome/browser/ui/webui/theme_source.h"
37 #include "chrome/common/chrome_switches.h" 38 #include "chrome/common/chrome_switches.h"
38 #include "chrome/common/url_constants.h" 39 #include "chrome/common/url_constants.h"
39 #include "content/public/browser/url_data_source.h" 40 #include "content/public/browser/url_data_source.h"
40 #include "content/public/browser/web_contents.h" 41 #include "content/public/browser/web_contents.h"
41 #include "content/public/browser/web_ui.h" 42 #include "content/public/browser/web_ui.h"
42 #include "grit/browser_resources.h" 43 #include "grit/browser_resources.h"
43 #include "ui/base/resource/resource_bundle.h" 44 #include "ui/base/resource/resource_bundle.h"
44 #include "ui/webui/jstemplate_builder.h" 45 #include "ui/webui/jstemplate_builder.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 const char OobeUI::kScreenOobeUpdate[] = "update"; 136 const char OobeUI::kScreenOobeUpdate[] = "update";
136 const char OobeUI::kScreenOobeEnrollment[] = "oauth-enrollment"; 137 const char OobeUI::kScreenOobeEnrollment[] = "oauth-enrollment";
137 const char OobeUI::kScreenGaiaSignin[] = "gaia-signin"; 138 const char OobeUI::kScreenGaiaSignin[] = "gaia-signin";
138 const char OobeUI::kScreenAccountPicker[] = "account-picker"; 139 const char OobeUI::kScreenAccountPicker[] = "account-picker";
139 const char OobeUI::kScreenErrorMessage[] = "error-message"; 140 const char OobeUI::kScreenErrorMessage[] = "error-message";
140 const char OobeUI::kScreenUserImagePicker[] = "user-image"; 141 const char OobeUI::kScreenUserImagePicker[] = "user-image";
141 const char OobeUI::kScreenTpmError[] = "tpm-error-message"; 142 const char OobeUI::kScreenTpmError[] = "tpm-error-message";
142 const char OobeUI::kScreenPasswordChanged[] = "password-changed"; 143 const char OobeUI::kScreenPasswordChanged[] = "password-changed";
143 const char OobeUI::kScreenManagedUserCreation[] = "managed-user-creation"; 144 const char OobeUI::kScreenManagedUserCreation[] = "managed-user-creation";
144 const char OobeUI::kScreenTermsOfService[] = "terms-of-service"; 145 const char OobeUI::kScreenTermsOfService[] = "terms-of-service";
146 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid";
145 147
146 OobeUI::OobeUI(content::WebUI* web_ui) 148 OobeUI::OobeUI(content::WebUI* web_ui)
147 : WebUIController(web_ui), 149 : WebUIController(web_ui),
148 update_screen_actor_(NULL), 150 update_screen_actor_(NULL),
149 network_screen_actor_(NULL), 151 network_screen_actor_(NULL),
150 eula_screen_actor_(NULL), 152 eula_screen_actor_(NULL),
151 reset_screen_actor_(NULL), 153 reset_screen_actor_(NULL),
154 wrong_hwid_screen_actor_(NULL),
152 error_screen_handler_(NULL), 155 error_screen_handler_(NULL),
153 signin_screen_handler_(NULL), 156 signin_screen_handler_(NULL),
154 terms_of_service_screen_actor_(NULL), 157 terms_of_service_screen_actor_(NULL),
155 user_image_screen_actor_(NULL), 158 user_image_screen_actor_(NULL),
156 current_screen_(SCREEN_UNKNOWN) { 159 current_screen_(SCREEN_UNKNOWN) {
157 InitializeScreenMaps(); 160 InitializeScreenMaps();
158 161
159 network_state_informer_ = new NetworkStateInformer(); 162 network_state_informer_ = new NetworkStateInformer();
160 network_state_informer_->Init(); 163 network_state_informer_->Init();
161 164
162 core_handler_ = new CoreOobeHandler(this); 165 core_handler_ = new CoreOobeHandler(this);
163 AddScreenHandler(core_handler_); 166 AddScreenHandler(core_handler_);
164 core_handler_->SetDelegate(this); 167 core_handler_->SetDelegate(this);
165 168
166 AddScreenHandler(new NetworkDropdownHandler); 169 AddScreenHandler(new NetworkDropdownHandler);
167 170
168 NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler(); 171 NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler();
169 network_screen_actor_ = network_screen_handler; 172 network_screen_actor_ = network_screen_handler;
170 AddScreenHandler(network_screen_handler); 173 AddScreenHandler(network_screen_handler);
171 174
172 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(); 175 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler();
173 eula_screen_actor_ = eula_screen_handler; 176 eula_screen_actor_ = eula_screen_handler;
174 AddScreenHandler(eula_screen_handler); 177 AddScreenHandler(eula_screen_handler);
175 178
176 ResetScreenHandler* reset_screen_handler = new ResetScreenHandler(); 179 ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
177 reset_screen_actor_ = reset_screen_handler; 180 reset_screen_actor_ = reset_screen_handler;
178 AddScreenHandler(reset_screen_handler); 181 AddScreenHandler(reset_screen_handler);
179 182
183 WrongHWIDScreenHandler* wrong_hwid_screen_handler =
184 new WrongHWIDScreenHandler();
185 wrong_hwid_screen_actor_ = wrong_hwid_screen_handler;
186 AddScreenHandler(wrong_hwid_screen_handler);
187
180 UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler(); 188 UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler();
181 update_screen_actor_ = update_screen_handler; 189 update_screen_actor_ = update_screen_handler;
182 AddScreenHandler(update_screen_handler); 190 AddScreenHandler(update_screen_handler);
183 191
184 EnterpriseOAuthEnrollmentScreenHandler* 192 EnterpriseOAuthEnrollmentScreenHandler*
185 enterprise_oauth_enrollment_screen_handler = 193 enterprise_oauth_enrollment_screen_handler =
186 new EnterpriseOAuthEnrollmentScreenHandler; 194 new EnterpriseOAuthEnrollmentScreenHandler;
187 enterprise_enrollment_screen_actor_ = 195 enterprise_enrollment_screen_actor_ =
188 enterprise_oauth_enrollment_screen_handler; 196 enterprise_oauth_enrollment_screen_handler;
189 AddScreenHandler(enterprise_oauth_enrollment_screen_handler); 197 AddScreenHandler(enterprise_oauth_enrollment_screen_handler);
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 } 268 }
261 269
262 ResetScreenActor* OobeUI::GetResetScreenActor() { 270 ResetScreenActor* OobeUI::GetResetScreenActor() {
263 return reset_screen_actor_; 271 return reset_screen_actor_;
264 } 272 }
265 273
266 TermsOfServiceScreenActor* OobeUI::GetTermsOfServiceScreenActor() { 274 TermsOfServiceScreenActor* OobeUI::GetTermsOfServiceScreenActor() {
267 return terms_of_service_screen_actor_; 275 return terms_of_service_screen_actor_;
268 } 276 }
269 277
278 WrongHWIDScreenActor* OobeUI::GetWrongHWIDScreenActor() {
279 return wrong_hwid_screen_actor_;
280 }
281
270 UserImageScreenActor* OobeUI::GetUserImageScreenActor() { 282 UserImageScreenActor* OobeUI::GetUserImageScreenActor() {
271 return user_image_screen_actor_; 283 return user_image_screen_actor_;
272 } 284 }
273 285
274 ViewScreenDelegate* OobeUI::GetRegistrationScreenActor() { 286 ViewScreenDelegate* OobeUI::GetRegistrationScreenActor() {
275 NOTIMPLEMENTED(); 287 NOTIMPLEMENTED();
276 return NULL; 288 return NULL;
277 } 289 }
278 290
279 ViewScreenDelegate* OobeUI::GetHTMLPageScreenActor() { 291 ViewScreenDelegate* OobeUI::GetHTMLPageScreenActor() {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate; 341 screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate;
330 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment; 342 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment;
331 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin; 343 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin;
332 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker; 344 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker;
333 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage; 345 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage;
334 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker; 346 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker;
335 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError; 347 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError;
336 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged; 348 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged;
337 screen_names_[SCREEN_CREATE_MANAGED_USER] = kScreenManagedUserCreation; 349 screen_names_[SCREEN_CREATE_MANAGED_USER] = kScreenManagedUserCreation;
338 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService; 350 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService;
351 screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID;
339 352
340 screen_ids_.clear(); 353 screen_ids_.clear();
341 for (size_t i = 0; i < screen_names_.size(); ++i) 354 for (size_t i = 0; i < screen_names_.size(); ++i)
342 screen_ids_[screen_names_[i]] = static_cast<Screen>(i); 355 screen_ids_[screen_names_[i]] = static_cast<Screen>(i);
343 } 356 }
344 357
345 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) { 358 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
346 web_ui()->AddMessageHandler(handler); 359 web_ui()->AddMessageHandler(handler);
347 handlers_.push_back(handler); 360 handlers_.push_back(handler);
348 } 361 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 void OobeUI::OnCurrentScreenChanged(const std::string& screen) { 396 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
384 if (screen_ids_.count(screen)) { 397 if (screen_ids_.count(screen)) {
385 current_screen_ = screen_ids_[screen]; 398 current_screen_ = screen_ids_[screen];
386 } else { 399 } else {
387 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 400 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
388 current_screen_ = SCREEN_UNKNOWN; 401 current_screen_ = SCREEN_UNKNOWN;
389 } 402 }
390 } 403 }
391 404
392 } // namespace chromeos 405 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698