| 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 "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/rand_util.h" | 9 #include "base/rand_util.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 #include "chrome/browser/chromeos/camera_detector.h" | 11 #include "chrome/browser/chromeos/camera_detector.h" |
| 12 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 12 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 13 #include "chrome/browser/chromeos/login/screens/error_screen.h" | 13 #include "chrome/browser/chromeos/login/screens/error_screen.h" |
| 14 #include "chrome/browser/chromeos/login/screens/screen_observer.h" | 14 #include "chrome/browser/chromeos/login/screens/screen_observer.h" |
| 15 #include "chrome/browser/chromeos/login/signin_specifics.h" | 15 #include "chrome/browser/chromeos/login/signin_specifics.h" |
| 16 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" | 16 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" |
| 17 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller.h" | 17 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller.h" |
| 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller_new.h" | 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller_new.h" |
| 19 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 19 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
| 20 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 20 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
| 21 #include "chrome/browser/chromeos/login/wizard_controller.h" | 21 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 22 #include "chrome/browser/supervised_user/supervised_user_constants.h" | 22 #include "chrome/browser/supervised_user/supervised_user_constants.h" |
| 23 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
.h" | 23 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
.h" |
| 24 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
_factory.h" | 24 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
_factory.h" |
| 25 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" | 25 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" |
| 26 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h" | 26 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h" |
| 27 #include "chromeos/login/auth/key.h" | 27 #include "chromeos/login/auth/key.h" |
| 28 #include "chromeos/login/auth/user_context.h" | 28 #include "chromeos/login/auth/user_context.h" |
| 29 #include "chromeos/network/network_state.h" | 29 #include "chromeos/network/network_state.h" |
| 30 #include "components/user_manager/user.h" |
| 30 #include "components/user_manager/user_image/user_image.h" | 31 #include "components/user_manager/user_image/user_image.h" |
| 31 #include "content/public/browser/browser_thread.h" | 32 #include "content/public/browser/browser_thread.h" |
| 32 #include "grit/generated_resources.h" | 33 #include "grit/generated_resources.h" |
| 33 #include "third_party/skia/include/core/SkBitmap.h" | 34 #include "third_party/skia/include/core/SkBitmap.h" |
| 34 #include "ui/base/l10n/l10n_util.h" | 35 #include "ui/base/l10n/l10n_util.h" |
| 35 #include "ui/gfx/image/image_skia.h" | 36 #include "ui/gfx/image/image_skia.h" |
| 36 | 37 |
| 37 namespace chromeos { | 38 namespace chromeos { |
| 38 | 39 |
| 39 namespace { | 40 namespace { |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 user_context.SetKey(Key(manager_password)); | 201 user_context.SetKey(Key(manager_password)); |
| 201 ExistingUserController::current_controller()->Login(user_context, | 202 ExistingUserController::current_controller()->Login(user_context, |
| 202 SigninSpecifics()); | 203 SigninSpecifics()); |
| 203 } | 204 } |
| 204 | 205 |
| 205 void SupervisedUserCreationScreen::CreateSupervisedUser( | 206 void SupervisedUserCreationScreen::CreateSupervisedUser( |
| 206 const base::string16& display_name, | 207 const base::string16& display_name, |
| 207 const std::string& supervised_user_password) { | 208 const std::string& supervised_user_password) { |
| 208 DCHECK(controller_.get()); | 209 DCHECK(controller_.get()); |
| 209 int image; | 210 int image; |
| 210 if (selected_image_ == User::kExternalImageIndex) | 211 if (selected_image_ == user_manager::User::USER_IMAGE_EXTERNAL) |
| 211 // TODO(dzhioev): crbug/249660 | 212 // TODO(dzhioev): crbug/249660 |
| 212 image = SupervisedUserCreationController::kDummyAvatarIndex; | 213 image = SupervisedUserCreationController::kDummyAvatarIndex; |
| 213 else | 214 else |
| 214 image = selected_image_; | 215 image = selected_image_; |
| 215 controller_->StartCreation(display_name, supervised_user_password, image); | 216 controller_->StartCreation(display_name, supervised_user_password, image); |
| 216 } | 217 } |
| 217 | 218 |
| 218 void SupervisedUserCreationScreen::ImportSupervisedUser( | 219 void SupervisedUserCreationScreen::ImportSupervisedUser( |
| 219 const std::string& user_id) { | 220 const std::string& user_id) { |
| 220 DCHECK(controller_.get()); | 221 DCHECK(controller_.get()); |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 } | 439 } |
| 439 | 440 |
| 440 // TODO(antrim) : this is an explicit code duplications with UserImageScreen. | 441 // TODO(antrim) : this is an explicit code duplications with UserImageScreen. |
| 441 // It should be removed by issue 251179. | 442 // It should be removed by issue 251179. |
| 442 | 443 |
| 443 void SupervisedUserCreationScreen::ApplyPicture() { | 444 void SupervisedUserCreationScreen::ApplyPicture() { |
| 444 std::string user_id = controller_->GetSupervisedUserId(); | 445 std::string user_id = controller_->GetSupervisedUserId(); |
| 445 UserManager* user_manager = UserManager::Get(); | 446 UserManager* user_manager = UserManager::Get(); |
| 446 UserImageManager* image_manager = user_manager->GetUserImageManager(user_id); | 447 UserImageManager* image_manager = user_manager->GetUserImageManager(user_id); |
| 447 switch (selected_image_) { | 448 switch (selected_image_) { |
| 448 case User::kExternalImageIndex: | 449 case user_manager::User::USER_IMAGE_EXTERNAL: |
| 449 // Photo decoding may not have been finished yet. | 450 // Photo decoding may not have been finished yet. |
| 450 if (user_photo_.isNull()) { | 451 if (user_photo_.isNull()) { |
| 451 apply_photo_after_decoding_ = true; | 452 apply_photo_after_decoding_ = true; |
| 452 return; | 453 return; |
| 453 } | 454 } |
| 454 image_manager->SaveUserImage( | 455 image_manager->SaveUserImage( |
| 455 user_manager::UserImage::CreateAndEncode(user_photo_)); | 456 user_manager::UserImage::CreateAndEncode(user_photo_)); |
| 456 break; | 457 break; |
| 457 case User::kProfileImageIndex: | 458 case user_manager::User::USER_IMAGE_PROFILE: |
| 458 NOTREACHED() << "Supervised users have no profile pictures"; | 459 NOTREACHED() << "Supervised users have no profile pictures"; |
| 459 break; | 460 break; |
| 460 default: | 461 default: |
| 461 DCHECK(selected_image_ >= 0 && | 462 DCHECK(selected_image_ >= 0 && |
| 462 selected_image_ < user_manager::kDefaultImagesCount); | 463 selected_image_ < user_manager::kDefaultImagesCount); |
| 463 image_manager->SaveUserDefaultImageIndex(selected_image_); | 464 image_manager->SaveUserDefaultImageIndex(selected_image_); |
| 464 break; | 465 break; |
| 465 } | 466 } |
| 466 // Proceed to tutorial. | 467 // Proceed to tutorial. |
| 467 actor_->ShowTutorialPage(); | 468 actor_->ShowTutorialPage(); |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 void SupervisedUserCreationScreen::OnDecodeImageFailed( | 576 void SupervisedUserCreationScreen::OnDecodeImageFailed( |
| 576 const ImageDecoder* decoder) { | 577 const ImageDecoder* decoder) { |
| 577 NOTREACHED() << "Failed to decode PNG image from WebUI"; | 578 NOTREACHED() << "Failed to decode PNG image from WebUI"; |
| 578 } | 579 } |
| 579 | 580 |
| 580 void SupervisedUserCreationScreen::OnImageSelected( | 581 void SupervisedUserCreationScreen::OnImageSelected( |
| 581 const std::string& image_type, | 582 const std::string& image_type, |
| 582 const std::string& image_url) { | 583 const std::string& image_url) { |
| 583 if (image_url.empty()) | 584 if (image_url.empty()) |
| 584 return; | 585 return; |
| 585 int user_image_index = User::kInvalidImageIndex; | 586 int user_image_index = user_manager::User::USER_IMAGE_INVALID; |
| 586 if (image_type == "default" && | 587 if (image_type == "default" && |
| 587 user_manager::IsDefaultImageUrl(image_url, &user_image_index)) { | 588 user_manager::IsDefaultImageUrl(image_url, &user_image_index)) { |
| 588 selected_image_ = user_image_index; | 589 selected_image_ = user_image_index; |
| 589 } else if (image_type == "camera") { | 590 } else if (image_type == "camera") { |
| 590 selected_image_ = User::kExternalImageIndex; | 591 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; |
| 591 } else { | 592 } else { |
| 592 NOTREACHED() << "Unexpected image type: " << image_type; | 593 NOTREACHED() << "Unexpected image type: " << image_type; |
| 593 } | 594 } |
| 594 } | 595 } |
| 595 | 596 |
| 596 void SupervisedUserCreationScreen::OnImageAccepted() { | 597 void SupervisedUserCreationScreen::OnImageAccepted() { |
| 597 } | 598 } |
| 598 | 599 |
| 599 } // namespace chromeos | 600 } // namespace chromeos |
| OLD | NEW |