OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/supervised/supervised_user_creation_scre
en.h" | 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre
en.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/wallpaper/wallpaper_controller.h" | 9 #include "ash/common/wallpaper/wallpaper_controller.h" |
10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 | 95 |
96 // static | 96 // static |
97 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get( | 97 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get( |
98 ScreenManager* manager) { | 98 ScreenManager* manager) { |
99 return static_cast<SupervisedUserCreationScreen*>( | 99 return static_cast<SupervisedUserCreationScreen*>( |
100 manager->GetScreen(OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW)); | 100 manager->GetScreen(OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW)); |
101 } | 101 } |
102 | 102 |
103 SupervisedUserCreationScreen::SupervisedUserCreationScreen( | 103 SupervisedUserCreationScreen::SupervisedUserCreationScreen( |
104 BaseScreenDelegate* base_screen_delegate, | 104 BaseScreenDelegate* base_screen_delegate, |
105 SupervisedUserCreationScreenHandler* actor) | 105 SupervisedUserCreationScreenHandler* view) |
106 : BaseScreen(base_screen_delegate, | 106 : BaseScreen(base_screen_delegate, |
107 OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW), | 107 OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW), |
108 actor_(actor), | 108 view_(view), |
109 on_error_screen_(false), | 109 on_error_screen_(false), |
110 manager_signin_in_progress_(false), | 110 manager_signin_in_progress_(false), |
111 last_page_(kNameOfIntroScreen), | 111 last_page_(kNameOfIntroScreen), |
112 sync_service_(NULL), | 112 sync_service_(NULL), |
113 apply_photo_after_decoding_(false), | 113 apply_photo_after_decoding_(false), |
114 selected_image_(0), | 114 selected_image_(0), |
115 histogram_helper_(new ErrorScreensHistogramHelper("Supervised")), | 115 histogram_helper_(new ErrorScreensHistogramHelper("Supervised")), |
116 weak_factory_(this) { | 116 weak_factory_(this) { |
117 DCHECK(actor_); | 117 DCHECK(view_); |
118 if (actor_) | 118 if (view_) |
119 actor_->SetDelegate(this); | 119 view_->SetDelegate(this); |
120 } | 120 } |
121 | 121 |
122 SupervisedUserCreationScreen::~SupervisedUserCreationScreen() { | 122 SupervisedUserCreationScreen::~SupervisedUserCreationScreen() { |
123 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); | 123 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); |
124 if (sync_service_) | 124 if (sync_service_) |
125 sync_service_->RemoveObserver(this); | 125 sync_service_->RemoveObserver(this); |
126 if (actor_) | 126 if (view_) |
127 actor_->SetDelegate(NULL); | 127 view_->SetDelegate(NULL); |
128 network_portal_detector::GetInstance()->RemoveObserver(this); | 128 network_portal_detector::GetInstance()->RemoveObserver(this); |
129 } | 129 } |
130 | 130 |
131 void SupervisedUserCreationScreen::Show() { | 131 void SupervisedUserCreationScreen::Show() { |
132 CameraPresenceNotifier::GetInstance()->AddObserver(this); | 132 CameraPresenceNotifier::GetInstance()->AddObserver(this); |
133 if (actor_) { | 133 if (view_) { |
134 actor_->Show(); | 134 view_->Show(); |
135 // TODO(antrim) : temorary hack (until upcoming hackaton). Should be | 135 // TODO(antrim) : temorary hack (until upcoming hackaton). Should be |
136 // removed once we have screens reworked. | 136 // removed once we have screens reworked. |
137 if (on_error_screen_) | 137 if (on_error_screen_) |
138 actor_->ShowPage(last_page_); | 138 view_->ShowPage(last_page_); |
139 else | 139 else |
140 actor_->ShowIntroPage(); | 140 view_->ShowIntroPage(); |
141 } | 141 } |
142 | 142 |
143 if (!on_error_screen_) | 143 if (!on_error_screen_) |
144 network_portal_detector::GetInstance()->AddAndFireObserver(this); | 144 network_portal_detector::GetInstance()->AddAndFireObserver(this); |
145 on_error_screen_ = false; | 145 on_error_screen_ = false; |
146 histogram_helper_->OnScreenShow(); | 146 histogram_helper_->OnScreenShow(); |
147 } | 147 } |
148 | 148 |
149 void SupervisedUserCreationScreen::OnPageSelected(const std::string& page) { | 149 void SupervisedUserCreationScreen::OnPageSelected(const std::string& page) { |
150 last_page_ = page; | 150 last_page_ = page; |
(...skipping 11 matching lines...) Expand all Loading... |
162 ErrorScreen* screen = get_base_screen_delegate()->GetErrorScreen(); | 162 ErrorScreen* screen = get_base_screen_delegate()->GetErrorScreen(); |
163 ConfigureErrorScreen(screen, network, state.status); | 163 ConfigureErrorScreen(screen, network, state.status); |
164 screen->SetUIState(NetworkError::UI_STATE_SUPERVISED); | 164 screen->SetUIState(NetworkError::UI_STATE_SUPERVISED); |
165 get_base_screen_delegate()->ShowErrorScreen(); | 165 get_base_screen_delegate()->ShowErrorScreen(); |
166 histogram_helper_->OnErrorShow(screen->GetErrorState()); | 166 histogram_helper_->OnErrorShow(screen->GetErrorState()); |
167 } | 167 } |
168 } | 168 } |
169 | 169 |
170 void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() { | 170 void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() { |
171 manager_signin_in_progress_ = false; | 171 manager_signin_in_progress_ = false; |
172 if (!actor_) | 172 if (!view_) |
173 return; | 173 return; |
174 actor_->ShowErrorPage( | 174 view_->ShowErrorPage( |
175 l10n_util::GetStringUTF16( | 175 l10n_util::GetStringUTF16( |
176 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_TITLE), | 176 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_TITLE), |
177 l10n_util::GetStringUTF16( | 177 l10n_util::GetStringUTF16( |
178 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE), | 178 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE), |
179 l10n_util::GetStringUTF16( | 179 l10n_util::GetStringUTF16( |
180 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_BUTTON)); | 180 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_BUTTON)); |
181 } | 181 } |
182 | 182 |
183 void SupervisedUserCreationScreen::ShowInitialScreen() { | 183 void SupervisedUserCreationScreen::ShowInitialScreen() { |
184 if (actor_) | 184 if (view_) |
185 actor_->ShowIntroPage(); | 185 view_->ShowIntroPage(); |
186 } | 186 } |
187 | 187 |
188 void SupervisedUserCreationScreen::Hide() { | 188 void SupervisedUserCreationScreen::Hide() { |
189 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); | 189 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); |
190 if (actor_) | 190 if (view_) |
191 actor_->Hide(); | 191 view_->Hide(); |
192 if (!on_error_screen_) | 192 if (!on_error_screen_) |
193 network_portal_detector::GetInstance()->RemoveObserver(this); | 193 network_portal_detector::GetInstance()->RemoveObserver(this); |
194 } | 194 } |
195 | 195 |
196 void SupervisedUserCreationScreen::AbortFlow() { | 196 void SupervisedUserCreationScreen::AbortFlow() { |
197 DBusThreadManager::Get() | 197 DBusThreadManager::Get() |
198 ->GetSessionManagerClient() | 198 ->GetSessionManagerClient() |
199 ->NotifySupervisedUserCreationFinished(); | 199 ->NotifySupervisedUserCreationFinished(); |
200 controller_->CancelCreation(); | 200 controller_->CancelCreation(); |
201 } | 201 } |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 user_info->GetString(SupervisedUserSyncService::kMasterKey, &master_key); | 266 user_info->GetString(SupervisedUserSyncService::kMasterKey, &master_key); |
267 user_info->GetString(SupervisedUserSyncService::kPasswordSignatureKey, | 267 user_info->GetString(SupervisedUserSyncService::kPasswordSignatureKey, |
268 &signature_key); | 268 &signature_key); |
269 user_info->GetString(SupervisedUserSyncService::kPasswordEncryptionKey, | 269 user_info->GetString(SupervisedUserSyncService::kPasswordEncryptionKey, |
270 &encryption_key); | 270 &encryption_key); |
271 user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar); | 271 user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar); |
272 user_info->GetBoolean(kUserExists, &exists); | 272 user_info->GetBoolean(kUserExists, &exists); |
273 | 273 |
274 // We should not get here with existing user selected, so just display error. | 274 // We should not get here with existing user selected, so just display error. |
275 if (exists) { | 275 if (exists) { |
276 actor_->ShowErrorPage( | 276 view_->ShowErrorPage( |
277 l10n_util::GetStringUTF16( | 277 l10n_util::GetStringUTF16( |
278 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE), | 278 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE), |
279 l10n_util::GetStringUTF16( | 279 l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR), |
280 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR), | |
281 l10n_util::GetStringUTF16( | 280 l10n_util::GetStringUTF16( |
282 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON)); | 281 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON)); |
283 return; | 282 return; |
284 } | 283 } |
285 | 284 |
286 SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index); | 285 SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index); |
287 | 286 |
288 const base::DictionaryValue* password_data = NULL; | 287 const base::DictionaryValue* password_data = NULL; |
289 SupervisedUserSharedSettingsService* shared_settings_service = | 288 SupervisedUserSharedSettingsService* shared_settings_service = |
290 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext( | 289 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext( |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 std::string avatar; | 325 std::string avatar; |
327 bool exists; | 326 bool exists; |
328 int avatar_index = SupervisedUserCreationController::kDummyAvatarIndex; | 327 int avatar_index = SupervisedUserCreationController::kDummyAvatarIndex; |
329 user_info->GetString(SupervisedUserSyncService::kName, &display_name); | 328 user_info->GetString(SupervisedUserSyncService::kName, &display_name); |
330 user_info->GetString(SupervisedUserSyncService::kMasterKey, &master_key); | 329 user_info->GetString(SupervisedUserSyncService::kMasterKey, &master_key); |
331 user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar); | 330 user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar); |
332 user_info->GetBoolean(kUserExists, &exists); | 331 user_info->GetBoolean(kUserExists, &exists); |
333 | 332 |
334 // We should not get here with existing user selected, so just display error. | 333 // We should not get here with existing user selected, so just display error. |
335 if (exists) { | 334 if (exists) { |
336 actor_->ShowErrorPage( | 335 view_->ShowErrorPage( |
337 l10n_util::GetStringUTF16( | 336 l10n_util::GetStringUTF16( |
338 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE), | 337 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE), |
339 l10n_util::GetStringUTF16( | 338 l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR), |
340 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR), | |
341 l10n_util::GetStringUTF16( | 339 l10n_util::GetStringUTF16( |
342 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON)); | 340 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON)); |
343 return; | 341 return; |
344 } | 342 } |
345 | 343 |
346 SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index); | 344 SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index); |
347 | 345 |
348 controller_->StartImport(display_name, | 346 controller_->StartImport(display_name, |
349 password, | 347 password, |
350 avatar_index, | 348 avatar_index, |
351 user_id, | 349 user_id, |
352 master_key); | 350 master_key); |
353 } | 351 } |
354 | 352 |
355 void SupervisedUserCreationScreen::OnManagerLoginFailure() { | 353 void SupervisedUserCreationScreen::OnManagerLoginFailure() { |
356 manager_signin_in_progress_ = false; | 354 manager_signin_in_progress_ = false; |
357 if (actor_) | 355 if (view_) |
358 actor_->ShowManagerPasswordError(); | 356 view_->ShowManagerPasswordError(); |
359 } | 357 } |
360 | 358 |
361 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated( | 359 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated( |
362 Profile* manager_profile) { | 360 Profile* manager_profile) { |
363 DBusThreadManager::Get() | 361 DBusThreadManager::Get() |
364 ->GetSessionManagerClient() | 362 ->GetSessionManagerClient() |
365 ->NotifySupervisedUserCreationStarted(); | 363 ->NotifySupervisedUserCreationStarted(); |
366 manager_signin_in_progress_ = false; | 364 manager_signin_in_progress_ = false; |
367 DCHECK(controller_.get()); | 365 DCHECK(controller_.get()); |
368 // For manager user, move wallpaper to locked container so that windows | 366 // For manager user, move wallpaper to locked container so that windows |
369 // created during the user image picker step are below it. | 367 // created during the user image picker step are below it. |
370 ash::WmShell::Get()->wallpaper_controller()->MoveToLockedContainer(); | 368 ash::WmShell::Get()->wallpaper_controller()->MoveToLockedContainer(); |
371 | 369 |
372 controller_->SetManagerProfile(manager_profile); | 370 controller_->SetManagerProfile(manager_profile); |
373 if (actor_) | 371 if (view_) |
374 actor_->ShowUsernamePage(); | 372 view_->ShowUsernamePage(); |
375 | 373 |
376 last_page_ = kNameOfNewUserParametersScreen; | 374 last_page_ = kNameOfNewUserParametersScreen; |
377 CHECK(!sync_service_); | 375 CHECK(!sync_service_); |
378 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile( | 376 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile( |
379 manager_profile); | 377 manager_profile); |
380 sync_service_->AddObserver(this); | 378 sync_service_->AddObserver(this); |
381 OnSupervisedUsersChanged(); | 379 OnSupervisedUsersChanged(); |
382 } | 380 } |
383 | 381 |
384 void SupervisedUserCreationScreen::OnSupervisedUsersChanged() { | 382 void SupervisedUserCreationScreen::OnSupervisedUsersChanged() { |
385 CHECK(sync_service_); | 383 CHECK(sync_service_); |
386 sync_service_->GetSupervisedUsersAsync( | 384 sync_service_->GetSupervisedUsersAsync( |
387 base::Bind(&SupervisedUserCreationScreen::OnGetSupervisedUsers, | 385 base::Bind(&SupervisedUserCreationScreen::OnGetSupervisedUsers, |
388 weak_factory_.GetWeakPtr())); | 386 weak_factory_.GetWeakPtr())); |
389 } | 387 } |
390 | 388 |
391 void SupervisedUserCreationScreen::OnManagerCryptohomeAuthenticated() { | 389 void SupervisedUserCreationScreen::OnManagerCryptohomeAuthenticated() { |
392 if (actor_) { | 390 if (view_) { |
393 actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16( | 391 view_->ShowStatusMessage( |
394 IDS_CREATE_SUPERVISED_USER_CREATION_AUTH_PROGRESS_MESSAGE)); | 392 true /* progress */, |
| 393 l10n_util::GetStringUTF16( |
| 394 IDS_CREATE_SUPERVISED_USER_CREATION_AUTH_PROGRESS_MESSAGE)); |
395 } | 395 } |
396 } | 396 } |
397 | 397 |
398 void SupervisedUserCreationScreen::OnActorDestroyed( | 398 void SupervisedUserCreationScreen::OnViewDestroyed( |
399 SupervisedUserCreationScreenHandler* actor) { | 399 SupervisedUserCreationScreenHandler* view) { |
400 if (actor_ == actor) | 400 if (view_ == view) |
401 actor_ = NULL; | 401 view_ = NULL; |
402 } | 402 } |
403 | 403 |
404 void SupervisedUserCreationScreen::OnCreationError( | 404 void SupervisedUserCreationScreen::OnCreationError( |
405 SupervisedUserCreationController::ErrorCode code) { | 405 SupervisedUserCreationController::ErrorCode code) { |
406 LOG(ERROR) << "Supervised user creation failure, code: " << code; | 406 LOG(ERROR) << "Supervised user creation failure, code: " << code; |
407 | 407 |
408 base::string16 title; | 408 base::string16 title; |
409 base::string16 message; | 409 base::string16 message; |
410 base::string16 button; | 410 base::string16 button; |
411 // TODO(antrim) : find out which errors do we really have. | 411 // TODO(antrim) : find out which errors do we really have. |
(...skipping 14 matching lines...) Expand all Loading... |
426 title = l10n_util::GetStringUTF16( | 426 title = l10n_util::GetStringUTF16( |
427 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE); | 427 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE); |
428 message = l10n_util::GetStringUTF16( | 428 message = l10n_util::GetStringUTF16( |
429 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR); | 429 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR); |
430 button = l10n_util::GetStringUTF16( | 430 button = l10n_util::GetStringUTF16( |
431 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON); | 431 IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON); |
432 break; | 432 break; |
433 case SupervisedUserCreationController::NO_ERROR: | 433 case SupervisedUserCreationController::NO_ERROR: |
434 NOTREACHED(); | 434 NOTREACHED(); |
435 } | 435 } |
436 if (actor_) | 436 if (view_) |
437 actor_->ShowErrorPage(title, message, button); | 437 view_->ShowErrorPage(title, message, button); |
438 } | 438 } |
439 | 439 |
440 void SupervisedUserCreationScreen::OnCreationTimeout() { | 440 void SupervisedUserCreationScreen::OnCreationTimeout() { |
441 if (actor_) { | 441 if (view_) { |
442 actor_->ShowStatusMessage(false /* error */, l10n_util::GetStringUTF16( | 442 view_->ShowStatusMessage( |
443 IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_TIMEOUT_MESSAGE)); | 443 false /* error */, |
| 444 l10n_util::GetStringUTF16( |
| 445 IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_TIMEOUT_MESSAGE)); |
444 } | 446 } |
445 } | 447 } |
446 | 448 |
447 void SupervisedUserCreationScreen::OnLongCreationWarning() { | 449 void SupervisedUserCreationScreen::OnLongCreationWarning() { |
448 if (actor_) { | 450 if (view_) { |
449 actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16( | 451 view_->ShowStatusMessage( |
450 IDS_PROFILES_CREATE_SUPERVISED_JUST_SIGNED_IN)); | 452 true /* progress */, |
| 453 l10n_util::GetStringUTF16( |
| 454 IDS_PROFILES_CREATE_SUPERVISED_JUST_SIGNED_IN)); |
451 } | 455 } |
452 } | 456 } |
453 | 457 |
454 bool SupervisedUserCreationScreen::FindUserByDisplayName( | 458 bool SupervisedUserCreationScreen::FindUserByDisplayName( |
455 const base::string16& display_name, | 459 const base::string16& display_name, |
456 std::string *out_id) const { | 460 std::string *out_id) const { |
457 if (!existing_users_.get()) | 461 if (!existing_users_.get()) |
458 return false; | 462 return false; |
459 for (base::DictionaryValue::Iterator it(*existing_users_.get()); | 463 for (base::DictionaryValue::Iterator it(*existing_users_.get()); |
460 !it.IsAtEnd(); it.Advance()) { | 464 !it.IsAtEnd(); it.Advance()) { |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
494 case user_manager::User::USER_IMAGE_PROFILE: | 498 case user_manager::User::USER_IMAGE_PROFILE: |
495 NOTREACHED() << "Supervised users have no profile pictures"; | 499 NOTREACHED() << "Supervised users have no profile pictures"; |
496 break; | 500 break; |
497 default: | 501 default: |
498 DCHECK(selected_image_ >= 0 && | 502 DCHECK(selected_image_ >= 0 && |
499 selected_image_ < default_user_image::kDefaultImagesCount); | 503 selected_image_ < default_user_image::kDefaultImagesCount); |
500 image_manager->SaveUserDefaultImageIndex(selected_image_); | 504 image_manager->SaveUserDefaultImageIndex(selected_image_); |
501 break; | 505 break; |
502 } | 506 } |
503 // Proceed to tutorial. | 507 // Proceed to tutorial. |
504 actor_->ShowTutorialPage(); | 508 view_->ShowTutorialPage(); |
505 } | 509 } |
506 | 510 |
507 void SupervisedUserCreationScreen::OnCreationSuccess() { | 511 void SupervisedUserCreationScreen::OnCreationSuccess() { |
508 ApplyPicture(); | 512 ApplyPicture(); |
509 } | 513 } |
510 | 514 |
511 void SupervisedUserCreationScreen::OnCameraPresenceCheckDone( | 515 void SupervisedUserCreationScreen::OnCameraPresenceCheckDone( |
512 bool is_camera_present) { | 516 bool is_camera_present) { |
513 if (actor_) | 517 if (view_) |
514 actor_->SetCameraPresent(is_camera_present); | 518 view_->SetCameraPresent(is_camera_present); |
515 } | 519 } |
516 | 520 |
517 void SupervisedUserCreationScreen::OnGetSupervisedUsers( | 521 void SupervisedUserCreationScreen::OnGetSupervisedUsers( |
518 const base::DictionaryValue* users) { | 522 const base::DictionaryValue* users) { |
519 // Copy for passing to WebUI, contains only id, name and avatar URL. | 523 // Copy for passing to WebUI, contains only id, name and avatar URL. |
520 std::unique_ptr<base::ListValue> ui_users(new base::ListValue()); | 524 std::unique_ptr<base::ListValue> ui_users(new base::ListValue()); |
521 SupervisedUserManager* supervised_user_manager = | 525 SupervisedUserManager* supervised_user_manager = |
522 ChromeUserManager::Get()->GetSupervisedUserManager(); | 526 ChromeUserManager::Get()->GetSupervisedUserManager(); |
523 | 527 |
524 // Stored copy, contains all necessary information. | 528 // Stored copy, contains all necessary information. |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
576 local_copy->GetString(SupervisedUserSyncService::kPasswordSignatureKey, | 580 local_copy->GetString(SupervisedUserSyncService::kPasswordSignatureKey, |
577 &signature_key) && | 581 &signature_key) && |
578 !signature_key.empty(); | 582 !signature_key.empty(); |
579 | 583 |
580 ui_copy->SetBoolean(kUserNeedPassword, !has_password); | 584 ui_copy->SetBoolean(kUserNeedPassword, !has_password); |
581 ui_copy->SetString("id", it.key()); | 585 ui_copy->SetString("id", it.key()); |
582 | 586 |
583 existing_users_->Set(it.key(), local_copy); | 587 existing_users_->Set(it.key(), local_copy); |
584 ui_users->Append(std::move(ui_copy)); | 588 ui_users->Append(std::move(ui_copy)); |
585 } | 589 } |
586 actor_->ShowExistingSupervisedUsers(ui_users.get()); | 590 view_->ShowExistingSupervisedUsers(ui_users.get()); |
587 } | 591 } |
588 | 592 |
589 void SupervisedUserCreationScreen::OnPhotoTaken( | 593 void SupervisedUserCreationScreen::OnPhotoTaken( |
590 const std::string& raw_data) { | 594 const std::string& raw_data) { |
591 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 595 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
592 user_photo_ = gfx::ImageSkia(); | 596 user_photo_ = gfx::ImageSkia(); |
593 ImageDecoder::Cancel(this); | 597 ImageDecoder::Cancel(this); |
594 ImageDecoder::Start(this, raw_data); | 598 ImageDecoder::Start(this, raw_data); |
595 } | 599 } |
596 | 600 |
(...skipping 21 matching lines...) Expand all Loading... |
618 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; | 622 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; |
619 } else { | 623 } else { |
620 NOTREACHED() << "Unexpected image type: " << image_type; | 624 NOTREACHED() << "Unexpected image type: " << image_type; |
621 } | 625 } |
622 } | 626 } |
623 | 627 |
624 void SupervisedUserCreationScreen::OnImageAccepted() { | 628 void SupervisedUserCreationScreen::OnImageAccepted() { |
625 } | 629 } |
626 | 630 |
627 } // namespace chromeos | 631 } // namespace chromeos |
OLD | NEW |