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

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

Powered by Google App Engine
This is Rietveld 408576698