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

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

Issue 137803008: cros: Update SAML flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: split gaia.css Created 6 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 "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 const char OobeUI::kScreenErrorMessage[] = "error-message"; 142 const char OobeUI::kScreenErrorMessage[] = "error-message";
143 const char OobeUI::kScreenUserImagePicker[] = "user-image"; 143 const char OobeUI::kScreenUserImagePicker[] = "user-image";
144 const char OobeUI::kScreenTpmError[] = "tpm-error-message"; 144 const char OobeUI::kScreenTpmError[] = "tpm-error-message";
145 const char OobeUI::kScreenPasswordChanged[] = "password-changed"; 145 const char OobeUI::kScreenPasswordChanged[] = "password-changed";
146 const char OobeUI::kScreenManagedUserCreationFlow[] 146 const char OobeUI::kScreenManagedUserCreationFlow[]
147 = "managed-user-creation"; 147 = "managed-user-creation";
148 const char OobeUI::kScreenTermsOfService[] = "terms-of-service"; 148 const char OobeUI::kScreenTermsOfService[] = "terms-of-service";
149 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid"; 149 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid";
150 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash"; 150 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash";
151 const char OobeUI::kScreenConfirmPassword[] = "confirm-password"; 151 const char OobeUI::kScreenConfirmPassword[] = "confirm-password";
152 const char OobeUI::kScreenMessageBox[] = "message-box"; 152 const char OobeUI::kScreenFatalError[] = "fatal-error";
153 153
154 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) 154 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
155 : WebUIController(web_ui), 155 : WebUIController(web_ui),
156 core_handler_(NULL), 156 core_handler_(NULL),
157 network_dropdown_handler_(NULL), 157 network_dropdown_handler_(NULL),
158 update_screen_handler_(NULL), 158 update_screen_handler_(NULL),
159 network_screen_actor_(NULL), 159 network_screen_actor_(NULL),
160 eula_screen_actor_(NULL), 160 eula_screen_actor_(NULL),
161 reset_screen_actor_(NULL), 161 reset_screen_actor_(NULL),
162 autolaunch_screen_actor_(NULL), 162 autolaunch_screen_actor_(NULL),
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage; 393 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage;
394 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker; 394 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker;
395 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError; 395 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError;
396 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged; 396 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged;
397 screen_names_[SCREEN_CREATE_MANAGED_USER_FLOW] = 397 screen_names_[SCREEN_CREATE_MANAGED_USER_FLOW] =
398 kScreenManagedUserCreationFlow; 398 kScreenManagedUserCreationFlow;
399 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService; 399 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService;
400 screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID; 400 screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID;
401 screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash; 401 screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash;
402 screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword; 402 screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword;
403 screen_names_[SCREEN_MESSAGE_BOX] = kScreenMessageBox; 403 screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError;
404 404
405 screen_ids_.clear(); 405 screen_ids_.clear();
406 for (size_t i = 0; i < screen_names_.size(); ++i) 406 for (size_t i = 0; i < screen_names_.size(); ++i)
407 screen_ids_[screen_names_[i]] = static_cast<Screen>(i); 407 screen_ids_[screen_names_[i]] = static_cast<Screen>(i);
408 } 408 }
409 409
410 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) { 410 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
411 web_ui()->AddMessageHandler(handler); 411 web_ui()->AddMessageHandler(handler);
412 handlers_.push_back(handler); 412 handlers_.push_back(handler);
413 } 413 }
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 observer_list_, 485 observer_list_,
486 OnCurrentScreenChanged(current_screen_, new_screen)); 486 OnCurrentScreenChanged(current_screen_, new_screen));
487 current_screen_ = new_screen; 487 current_screen_ = new_screen;
488 } else { 488 } else {
489 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 489 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
490 current_screen_ = SCREEN_UNKNOWN; 490 current_screen_ = SCREEN_UNKNOWN;
491 } 491 }
492 } 492 }
493 493
494 } // namespace chromeos 494 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698