| 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/shelf/wm_shelf.h" | 9 #include "ash/common/shelf/wm_shelf.h" |
| 10 #include "ash/common/wallpaper/wallpaper_controller.h" | 10 #include "ash/common/wallpaper/wallpaper_controller.h" |
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 UserImageManager* image_manager = | 492 UserImageManager* image_manager = |
| 493 ChromeUserManager::Get()->GetUserImageManager( | 493 ChromeUserManager::Get()->GetUserImageManager( |
| 494 AccountId::FromUserEmail(user_id)); | 494 AccountId::FromUserEmail(user_id)); |
| 495 switch (selected_image_) { | 495 switch (selected_image_) { |
| 496 case user_manager::User::USER_IMAGE_EXTERNAL: | 496 case user_manager::User::USER_IMAGE_EXTERNAL: |
| 497 // Photo decoding may not have been finished yet. | 497 // Photo decoding may not have been finished yet. |
| 498 if (user_photo_.isNull()) { | 498 if (user_photo_.isNull()) { |
| 499 apply_photo_after_decoding_ = true; | 499 apply_photo_after_decoding_ = true; |
| 500 return; | 500 return; |
| 501 } | 501 } |
| 502 image_manager->SaveUserImage( | 502 image_manager->SaveUserImage(user_manager::UserImage::CreateAndEncode( |
| 503 user_manager::UserImage::CreateAndEncode(user_photo_)); | 503 user_photo_, user_manager::UserImage::FORMAT_JPEG)); |
| 504 break; | 504 break; |
| 505 case user_manager::User::USER_IMAGE_PROFILE: | 505 case user_manager::User::USER_IMAGE_PROFILE: |
| 506 NOTREACHED() << "Supervised users have no profile pictures"; | 506 NOTREACHED() << "Supervised users have no profile pictures"; |
| 507 break; | 507 break; |
| 508 default: | 508 default: |
| 509 DCHECK(selected_image_ >= 0 && | 509 DCHECK(selected_image_ >= 0 && |
| 510 selected_image_ < default_user_image::kDefaultImagesCount); | 510 selected_image_ < default_user_image::kDefaultImagesCount); |
| 511 image_manager->SaveUserDefaultImageIndex(selected_image_); | 511 image_manager->SaveUserDefaultImageIndex(selected_image_); |
| 512 break; | 512 break; |
| 513 } | 513 } |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; | 629 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; |
| 630 } else { | 630 } else { |
| 631 NOTREACHED() << "Unexpected image type: " << image_type; | 631 NOTREACHED() << "Unexpected image type: " << image_type; |
| 632 } | 632 } |
| 633 } | 633 } |
| 634 | 634 |
| 635 void SupervisedUserCreationScreen::OnImageAccepted() { | 635 void SupervisedUserCreationScreen::OnImageAccepted() { |
| 636 } | 636 } |
| 637 | 637 |
| 638 } // namespace chromeos | 638 } // namespace chromeos |
| OLD | NEW |