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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_image_screen.cc

Issue 2537713002: Add support for transparent/translucent pixels in the user image (Closed)
Patch Set: rebased Created 4 years 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/screens/user_image_screen.h" 5 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 void UserImageScreen::OnImageAccepted() { 186 void UserImageScreen::OnImageAccepted() {
187 UserImageManager* image_manager = GetUserImageManager(); 187 UserImageManager* image_manager = GetUserImageManager();
188 int uma_index = 0; 188 int uma_index = 0;
189 switch (selected_image_) { 189 switch (selected_image_) {
190 case user_manager::User::USER_IMAGE_EXTERNAL: 190 case user_manager::User::USER_IMAGE_EXTERNAL:
191 // Photo decoding may not have been finished yet. 191 // Photo decoding may not have been finished yet.
192 if (user_photo_.isNull()) { 192 if (user_photo_.isNull()) {
193 accept_photo_after_decoding_ = true; 193 accept_photo_after_decoding_ = true;
194 return; 194 return;
195 } 195 }
196 image_manager->SaveUserImage( 196 image_manager->SaveUserImage(user_manager::UserImage::CreateAndEncode(
197 user_manager::UserImage::CreateAndEncode(user_photo_)); 197 user_photo_, user_manager::UserImage::FORMAT_JPEG));
198 uma_index = default_user_image::kHistogramImageFromCamera; 198 uma_index = default_user_image::kHistogramImageFromCamera;
199 break; 199 break;
200 case user_manager::User::USER_IMAGE_PROFILE: 200 case user_manager::User::USER_IMAGE_PROFILE:
201 image_manager->SaveUserImageFromProfileImage(); 201 image_manager->SaveUserImageFromProfileImage();
202 uma_index = default_user_image::kHistogramImageFromProfile; 202 uma_index = default_user_image::kHistogramImageFromProfile;
203 break; 203 break;
204 default: 204 default:
205 DCHECK(selected_image_ >= 0 && 205 DCHECK(selected_image_ >= 0 &&
206 selected_image_ < default_user_image::kDefaultImagesCount); 206 selected_image_ < default_user_image::kDefaultImagesCount);
207 image_manager->SaveUserDefaultImageIndex(selected_image_); 207 image_manager->SaveUserDefaultImageIndex(selected_image_);
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 354
355 void UserImageScreen::ReportSyncResult(SyncResult timed_out) const { 355 void UserImageScreen::ReportSyncResult(SyncResult timed_out) const {
356 base::TimeDelta duration = base::Time::Now() - sync_waiting_start_time_; 356 base::TimeDelta duration = base::Time::Now() - sync_waiting_start_time_;
357 UMA_HISTOGRAM_TIMES("Login.NewUserPriorityPrefsSyncTime", duration); 357 UMA_HISTOGRAM_TIMES("Login.NewUserPriorityPrefsSyncTime", duration);
358 UMA_HISTOGRAM_ENUMERATION("Login.NewUserPriorityPrefsSyncResult", 358 UMA_HISTOGRAM_ENUMERATION("Login.NewUserPriorityPrefsSyncResult",
359 static_cast<int>(timed_out), 359 static_cast<int>(timed_out),
360 static_cast<int>(SyncResult::COUNT)); 360 static_cast<int>(SyncResult::COUNT));
361 } 361 }
362 362
363 } // namespace chromeos 363 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698