OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/user_image_screen.h" | 5 #include "chrome/browser/chromeos/login/user_image_screen.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" | 9 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" |
10 #include "chrome/browser/chromeos/login/default_user_images.h" | 10 #include "chrome/browser/chromeos/login/default_user_images.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 actor_->ShowCameraInitializing(); | 109 actor_->ShowCameraInitializing(); |
110 camera_controller_.Start(); | 110 camera_controller_.Start(); |
111 } | 111 } |
112 | 112 |
113 void UserImageScreen::StopCamera() { | 113 void UserImageScreen::StopCamera() { |
114 camera_controller_.Stop(); | 114 camera_controller_.Stop(); |
115 } | 115 } |
116 | 116 |
117 void UserImageScreen::OnPhotoTaken(const gfx::ImageSkia& image) { | 117 void UserImageScreen::OnPhotoTaken(const gfx::ImageSkia& image) { |
118 UserManager* user_manager = UserManager::Get(); | 118 UserManager* user_manager = UserManager::Get(); |
| 119 // TODO(ivankr): once old camera UI is gone, there's raw data in image |
| 120 // decoder, pass UserImage and user it instead. |
119 user_manager->SaveUserImage(user_manager->GetLoggedInUser().email(), | 121 user_manager->SaveUserImage(user_manager->GetLoggedInUser().email(), |
120 UserImage(image)); | 122 UserImage::CreateAndEncode(image)); |
121 | 123 |
122 get_screen_observer()->OnExit(ScreenObserver::USER_IMAGE_SELECTED); | 124 get_screen_observer()->OnExit(ScreenObserver::USER_IMAGE_SELECTED); |
123 | 125 |
124 UMA_HISTOGRAM_ENUMERATION("UserImage.FirstTimeChoice", | 126 UMA_HISTOGRAM_ENUMERATION("UserImage.FirstTimeChoice", |
125 kHistogramImageFromCamera, | 127 kHistogramImageFromCamera, |
126 kHistogramImagesCount); | 128 kHistogramImagesCount); |
127 } | 129 } |
128 | 130 |
129 void UserImageScreen::OnProfileImageSelected() { | 131 void UserImageScreen::OnProfileImageSelected() { |
130 UserManager* user_manager = UserManager::Get(); | 132 UserManager* user_manager = UserManager::Get(); |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 if (actor_) | 182 if (actor_) |
181 actor_->OnProfileImageAbsent(); | 183 actor_->OnProfileImageAbsent(); |
182 break; | 184 break; |
183 } | 185 } |
184 default: | 186 default: |
185 NOTREACHED(); | 187 NOTREACHED(); |
186 } | 188 } |
187 } | 189 } |
188 | 190 |
189 } // namespace chromeos | 191 } // namespace chromeos |
OLD | NEW |