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

Side by Side Diff: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

Issue 14028005: Update locally managed user creation flow according to mocks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with TOT Created 7 years, 8 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/login/managed/locally_managed_user_creation_sc reen.h" 5 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_sc reen.h"
6 6
7 #include "chrome/browser/chromeos/cros/network_library.h" 7 #include "chrome/browser/chromeos/cros/network_library.h"
8 #include "chrome/browser/chromeos/login/existing_user_controller.h" 8 #include "chrome/browser/chromeos/login/existing_user_controller.h"
9 #include "chrome/browser/chromeos/login/managed/locally_managed_user_controller. h" 9 #include "chrome/browser/chromeos/login/managed/locally_managed_user_controller. h"
10 #include "chrome/browser/chromeos/login/screens/error_screen.h" 10 #include "chrome/browser/chromeos/login/screens/error_screen.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 void LocallyManagedUserCreationScreen::PrepareToShow() { 66 void LocallyManagedUserCreationScreen::PrepareToShow() {
67 if (actor_) 67 if (actor_)
68 actor_->PrepareToShow(); 68 actor_->PrepareToShow();
69 } 69 }
70 70
71 void LocallyManagedUserCreationScreen::Show() { 71 void LocallyManagedUserCreationScreen::Show() {
72 if (actor_) { 72 if (actor_) {
73 actor_->Show(); 73 actor_->Show();
74 // TODO(antrim) : temorary hack (until upcoming hackaton). Should be 74 // TODO(antrim) : temorary hack (until upcoming hackaton). Should be
75 // removed once we have screens reworked. 75 // removed once we have screens reworked.
76 if (on_image_screen_) { 76 if (on_image_screen_)
77 actor_->ShowPostImageSelectionScreen(); 77 actor_->ShowTutorialPage();
78 } else { 78 else
79 actor_->ShowInitialScreen(); 79 actor_->ShowIntroPage();
80 }
81 } 80 }
82 81
83 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); 82 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
84 if (detector && !on_error_screen_) 83 if (detector && !on_error_screen_)
85 detector->AddAndFireObserver(this); 84 detector->AddAndFireObserver(this);
86 on_error_screen_ = false; 85 on_error_screen_ = false;
87 } 86 }
88 87
89 void LocallyManagedUserCreationScreen::OnPortalDetectionCompleted( 88 void LocallyManagedUserCreationScreen::OnPortalDetectionCompleted(
90 const Network* network, 89 const Network* network,
91 const NetworkPortalDetector::CaptivePortalState& state) { 90 const NetworkPortalDetector::CaptivePortalState& state) {
92 if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) { 91 if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) {
93 get_screen_observer()->HideErrorScreen(this); 92 get_screen_observer()->HideErrorScreen(this);
94 } else { 93 } else {
95 on_error_screen_ = true; 94 on_error_screen_ = true;
96 ErrorScreen* screen = get_screen_observer()->GetErrorScreen(); 95 ErrorScreen* screen = get_screen_observer()->GetErrorScreen();
97 ConfigureErrorScreen(screen, network, state.status); 96 ConfigureErrorScreen(screen, network, state.status);
98 screen->SetUIState(ErrorScreen::UI_STATE_LOCALLY_MANAGED); 97 screen->SetUIState(ErrorScreen::UI_STATE_LOCALLY_MANAGED);
99 get_screen_observer()->ShowErrorScreen(); 98 get_screen_observer()->ShowErrorScreen();
100 } 99 }
101 } 100 }
102 101
103 void LocallyManagedUserCreationScreen:: 102 void LocallyManagedUserCreationScreen::
104 ShowManagerInconsistentStateErrorScreen() { 103 ShowManagerInconsistentStateErrorScreen() {
105 if (!actor_) 104 if (!actor_)
106 return; 105 return;
107 actor_->ShowErrorMessage( 106 actor_->ShowErrorPage(
108 l10n_util::GetStringUTF16( 107 l10n_util::GetStringUTF16(
109 IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE), 108 IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE),
110 false); 109 false);
111 } 110 }
112 111
113 void LocallyManagedUserCreationScreen::ShowInitialScreen() { 112 void LocallyManagedUserCreationScreen::ShowInitialScreen() {
114 if (actor_) 113 if (actor_)
115 actor_->ShowInitialScreen(); 114 actor_->ShowIntroPage();
116 } 115 }
117 116
118 void LocallyManagedUserCreationScreen::Hide() { 117 void LocallyManagedUserCreationScreen::Hide() {
119 if (actor_) 118 if (actor_)
120 actor_->Hide(); 119 actor_->Hide();
121 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); 120 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
122 if (detector && !on_error_screen_) 121 if (detector && !on_error_screen_)
123 detector->RemoveObserver(this); 122 detector->RemoveObserver(this);
124 } 123 }
125 124
126 std::string LocallyManagedUserCreationScreen::GetName() const { 125 std::string LocallyManagedUserCreationScreen::GetName() const {
127 return WizardController::kLocallyManagedUserCreationScreenName; 126 return WizardController::kLocallyManagedUserCreationScreenName;
128 } 127 }
129 128
130 void LocallyManagedUserCreationScreen::AbortFlow() { 129 void LocallyManagedUserCreationScreen::AbortFlow() {
131 controller_->FinishCreation(); 130 controller_->FinishCreation();
132 } 131 }
133 132
134 void LocallyManagedUserCreationScreen::FinishFlow() { 133 void LocallyManagedUserCreationScreen::FinishFlow() {
135 controller_->FinishCreation(); 134 controller_->FinishCreation();
136 } 135 }
137 136
138 void LocallyManagedUserCreationScreen::RetryLastStep() { 137 void LocallyManagedUserCreationScreen::AuthenticateManager(
139 controller_->RetryLastStep();
140 }
141
142 void LocallyManagedUserCreationScreen::RunFlow(
143 string16& display_name,
144 std::string& managed_user_password,
145 std::string& manager_id, 138 std::string& manager_id,
146 std::string& manager_password) { 139 std::string& manager_password) {
147
148 // Make sure no two controllers exist at the same time. 140 // Make sure no two controllers exist at the same time.
149 controller_.reset(); 141 controller_.reset();
150 controller_.reset(new LocallyManagedUserController(this)); 142 controller_.reset(new LocallyManagedUserController(this));
151 controller_->SetUpCreation(display_name, managed_user_password);
152 143
153 ExistingUserController::current_controller()-> 144 ExistingUserController::current_controller()->
154 Login(UserContext(manager_id, 145 Login(UserContext(manager_id,
155 manager_password, 146 manager_password,
156 std::string() /* auth_code */)); 147 std::string() /* auth_code */));
157 } 148 }
158 149
150 void LocallyManagedUserCreationScreen::CreateManagedUser(
151 string16& display_name,
152 std::string& managed_user_password) {
153 DCHECK(controller_.get());
154 controller_->SetUpCreation(display_name, managed_user_password);
155 controller_->StartCreation();
156 }
157
159 void LocallyManagedUserCreationScreen::OnManagerLoginFailure() { 158 void LocallyManagedUserCreationScreen::OnManagerLoginFailure() {
160 if (actor_) 159 if (actor_)
161 actor_->ShowManagerPasswordError(); 160 actor_->ShowManagerPasswordError();
162 } 161 }
163 162
164 void LocallyManagedUserCreationScreen::OnManagerSignIn() { 163 void LocallyManagedUserCreationScreen::OnManagerFullyAuthenticated() {
165 if (actor_) 164 if (actor_)
166 actor_->ShowProgressScreen(); 165 actor_->ShowUsernamePage();
167 controller_->StartCreation(); 166 }
167
168 void LocallyManagedUserCreationScreen::OnManagerCryptohomeAuthenticated() {
169 if (actor_)
170 actor_->ShowProgressPage();
168 } 171 }
169 172
170 void LocallyManagedUserCreationScreen::OnExit() {} 173 void LocallyManagedUserCreationScreen::OnExit() {}
171 174
172 void LocallyManagedUserCreationScreen::OnActorDestroyed( 175 void LocallyManagedUserCreationScreen::OnActorDestroyed(
173 LocallyManagedUserCreationScreenHandler* actor) { 176 LocallyManagedUserCreationScreenHandler* actor) {
174 if (actor_ == actor) 177 if (actor_ == actor)
175 actor_ = NULL; 178 actor_ = NULL;
176 } 179 }
177 180
(...skipping 19 matching lines...) Expand all
197 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_TIMED_OUT); 200 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_TIMED_OUT);
198 break; 201 break;
199 case LocallyManagedUserController::CLOUD_SERVER_ERROR: 202 case LocallyManagedUserController::CLOUD_SERVER_ERROR:
200 message = l10n_util::GetStringUTF16( 203 message = l10n_util::GetStringUTF16(
201 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_SERVER_ERROR); 204 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_SERVER_ERROR);
202 break; 205 break;
203 default: 206 default:
204 NOTREACHED(); 207 NOTREACHED();
205 } 208 }
206 if (actor_) 209 if (actor_)
207 actor_->ShowErrorMessage(message, recoverable); 210 actor_->ShowErrorPage(message, recoverable);
208 } 211 }
209 212
210 void LocallyManagedUserCreationScreen::SelectPicture() { 213 void LocallyManagedUserCreationScreen::SelectPicture() {
211 on_image_screen_ = true; 214 on_image_screen_ = true;
212 WizardController::default_controller()-> 215 WizardController::default_controller()->
213 EnableUserImageScreenReturnToPreviousHack(); 216 EnableUserImageScreenReturnToPreviousHack();
214 DictionaryValue* params = new DictionaryValue(); 217 DictionaryValue* params = new DictionaryValue();
215 params->SetBoolean("profile_picture_enabled", false); 218 params->SetBoolean("profile_picture_enabled", false);
216 params->SetString("user_id", controller_->GetManagedUserId()); 219 params->SetString("user_id", controller_->GetManagedUserId());
217 220
218 WizardController::default_controller()-> 221 WizardController::default_controller()->
219 AdvanceToScreenWithParams(WizardController::kUserImageScreenName, params); 222 AdvanceToScreenWithParams(WizardController::kUserImageScreenName, params);
220 } 223 }
221 224
222 void LocallyManagedUserCreationScreen::OnCreationSuccess() { 225 void LocallyManagedUserCreationScreen::OnCreationSuccess() {
223 SelectPicture(); 226 SelectPicture();
224 } 227 }
225 228
226 } // namespace chromeos 229 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698