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

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: Removed log message. 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 13 matching lines...) Expand all
24 #include "chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_scr een_handler.h" 24 #include "chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_scr een_handler.h"
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/update_screen_handler.h" 32 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
33 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h" 33 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
34 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h"
34 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 35 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
35 #include "chrome/browser/ui/webui/theme_source.h" 36 #include "chrome/browser/ui/webui/theme_source.h"
36 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
37 #include "chrome/common/url_constants.h" 38 #include "chrome/common/url_constants.h"
38 #include "content/public/browser/url_data_source.h" 39 #include "content/public/browser/url_data_source.h"
39 #include "content/public/browser/web_contents.h" 40 #include "content/public/browser/web_contents.h"
40 #include "content/public/browser/web_ui.h" 41 #include "content/public/browser/web_ui.h"
41 #include "grit/browser_resources.h" 42 #include "grit/browser_resources.h"
42 #include "ui/base/resource/resource_bundle.h" 43 #include "ui/base/resource/resource_bundle.h"
43 #include "ui/webui/jstemplate_builder.h" 44 #include "ui/webui/jstemplate_builder.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 const char OobeUI::kScreenTpmError[] = "tpm-error-message"; 141 const char OobeUI::kScreenTpmError[] = "tpm-error-message";
141 const char OobeUI::kScreenPasswordChanged[] = "password-changed"; 142 const char OobeUI::kScreenPasswordChanged[] = "password-changed";
142 const char OobeUI::kScreenManagedUserCreation[] = "managed-user-creation"; 143 const char OobeUI::kScreenManagedUserCreation[] = "managed-user-creation";
143 144
144 OobeUI::OobeUI(content::WebUI* web_ui) 145 OobeUI::OobeUI(content::WebUI* web_ui)
145 : WebUIController(web_ui), 146 : WebUIController(web_ui),
146 update_screen_actor_(NULL), 147 update_screen_actor_(NULL),
147 network_screen_actor_(NULL), 148 network_screen_actor_(NULL),
148 eula_screen_actor_(NULL), 149 eula_screen_actor_(NULL),
149 reset_screen_actor_(NULL), 150 reset_screen_actor_(NULL),
151 wrong_hwid_screen_actor_(NULL),
150 error_screen_handler_(NULL), 152 error_screen_handler_(NULL),
151 signin_screen_handler_(NULL), 153 signin_screen_handler_(NULL),
152 user_image_screen_actor_(NULL), 154 user_image_screen_actor_(NULL),
153 current_screen_(SCREEN_UNKNOWN) { 155 current_screen_(SCREEN_UNKNOWN) {
154 InitializeScreenMaps(); 156 InitializeScreenMaps();
155 157
156 network_state_informer_ = new NetworkStateInformer(); 158 network_state_informer_ = new NetworkStateInformer();
157 network_state_informer_->Init(); 159 network_state_informer_->Init();
158 160
159 core_handler_ = new CoreOobeHandler(this); 161 core_handler_ = new CoreOobeHandler(this);
160 AddScreenHandler(core_handler_); 162 AddScreenHandler(core_handler_);
161 core_handler_->SetDelegate(this); 163 core_handler_->SetDelegate(this);
162 164
163 AddScreenHandler(new NetworkDropdownHandler); 165 AddScreenHandler(new NetworkDropdownHandler);
164 166
165 NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler(); 167 NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler();
166 network_screen_actor_ = network_screen_handler; 168 network_screen_actor_ = network_screen_handler;
167 AddScreenHandler(network_screen_handler); 169 AddScreenHandler(network_screen_handler);
168 170
169 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(); 171 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler();
170 eula_screen_actor_ = eula_screen_handler; 172 eula_screen_actor_ = eula_screen_handler;
171 AddScreenHandler(eula_screen_handler); 173 AddScreenHandler(eula_screen_handler);
172 174
173 ResetScreenHandler* reset_screen_handler = new ResetScreenHandler(); 175 ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
174 reset_screen_actor_ = reset_screen_handler; 176 reset_screen_actor_ = reset_screen_handler;
175 AddScreenHandler(reset_screen_handler); 177 AddScreenHandler(reset_screen_handler);
176 178
179 WrongHWIDScreenHandler* wrong_hwid_screen_handler =
180 new WrongHWIDScreenHandler();
181 wrong_hwid_screen_actor_ = wrong_hwid_screen_handler;
182 AddScreenHandler(wrong_hwid_screen_handler);
183
177 UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler(); 184 UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler();
178 update_screen_actor_ = update_screen_handler; 185 update_screen_actor_ = update_screen_handler;
179 AddScreenHandler(update_screen_handler); 186 AddScreenHandler(update_screen_handler);
180 187
181 EnterpriseOAuthEnrollmentScreenHandler* 188 EnterpriseOAuthEnrollmentScreenHandler*
182 enterprise_oauth_enrollment_screen_handler = 189 enterprise_oauth_enrollment_screen_handler =
183 new EnterpriseOAuthEnrollmentScreenHandler; 190 new EnterpriseOAuthEnrollmentScreenHandler;
184 enterprise_enrollment_screen_actor_ = 191 enterprise_enrollment_screen_actor_ =
185 enterprise_oauth_enrollment_screen_handler; 192 enterprise_oauth_enrollment_screen_handler;
186 AddScreenHandler(enterprise_oauth_enrollment_screen_handler); 193 AddScreenHandler(enterprise_oauth_enrollment_screen_handler);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 255
249 EnterpriseEnrollmentScreenActor* OobeUI:: 256 EnterpriseEnrollmentScreenActor* OobeUI::
250 GetEnterpriseEnrollmentScreenActor() { 257 GetEnterpriseEnrollmentScreenActor() {
251 return enterprise_enrollment_screen_actor_; 258 return enterprise_enrollment_screen_actor_;
252 } 259 }
253 260
254 ResetScreenActor* OobeUI::GetResetScreenActor() { 261 ResetScreenActor* OobeUI::GetResetScreenActor() {
255 return reset_screen_actor_; 262 return reset_screen_actor_;
256 } 263 }
257 264
265 WrongHWIDScreenActor* OobeUI::GetWrongHWIDScreenActor() {
266 return wrong_hwid_screen_actor_;
267 }
268
258 UserImageScreenActor* OobeUI::GetUserImageScreenActor() { 269 UserImageScreenActor* OobeUI::GetUserImageScreenActor() {
259 return user_image_screen_actor_; 270 return user_image_screen_actor_;
260 } 271 }
261 272
262 ViewScreenDelegate* OobeUI::GetRegistrationScreenActor() { 273 ViewScreenDelegate* OobeUI::GetRegistrationScreenActor() {
263 NOTIMPLEMENTED(); 274 NOTIMPLEMENTED();
264 return NULL; 275 return NULL;
265 } 276 }
266 277
267 ViewScreenDelegate* OobeUI::GetHTMLPageScreenActor() { 278 ViewScreenDelegate* OobeUI::GetHTMLPageScreenActor() {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 screen_names_[SCREEN_OOBE_NETWORK] = kScreenOobeNetwork; 326 screen_names_[SCREEN_OOBE_NETWORK] = kScreenOobeNetwork;
316 screen_names_[SCREEN_OOBE_EULA] = kScreenOobeEula; 327 screen_names_[SCREEN_OOBE_EULA] = kScreenOobeEula;
317 screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate; 328 screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate;
318 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment; 329 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment;
319 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin; 330 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin;
320 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker; 331 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker;
321 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage; 332 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage;
322 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker; 333 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker;
323 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError; 334 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError;
324 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged; 335 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged;
325 screen_names_[SCREEN_CREATE_MANAGED_USER] = kScreenManagedUserCreation; 336 screen_names_[SCREEN_CREATE_MANAGED_USER] = kScreenManagedUserCreation;
Nikita (slow) 2013/02/11 17:09:03 Please add new screen to screen_names_ map.
dzhioev (left Google) 2013/02/11 23:32:56 Done.
326 337
327 screen_ids_.clear(); 338 screen_ids_.clear();
328 for (size_t i = 0; i < screen_names_.size(); ++i) 339 for (size_t i = 0; i < screen_names_.size(); ++i)
329 screen_ids_[screen_names_[i]] = static_cast<Screen>(i); 340 screen_ids_[screen_names_[i]] = static_cast<Screen>(i);
330 } 341 }
331 342
332 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) { 343 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
333 web_ui()->AddMessageHandler(handler); 344 web_ui()->AddMessageHandler(handler);
334 handlers_.push_back(handler); 345 handlers_.push_back(handler);
335 } 346 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 void OobeUI::OnCurrentScreenChanged(const std::string& screen) { 381 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
371 if (screen_ids_.count(screen)) { 382 if (screen_ids_.count(screen)) {
372 current_screen_ = screen_ids_[screen]; 383 current_screen_ = screen_ids_[screen];
373 } else { 384 } else {
374 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 385 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
375 current_screen_ = SCREEN_UNKNOWN; 386 current_screen_ = SCREEN_UNKNOWN;
376 } 387 }
377 } 388 }
378 389
379 } // namespace chromeos 390 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698