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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/ui/webui/options/chromeos/change_picture_options_handle r.h" 5 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
6 6
7 #include <utility> 7 #include <utility>
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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 346
347 UserImageManager* user_image_manager = 347 UserImageManager* user_image_manager =
348 ChromeUserManager::Get()->GetUserImageManager(GetUser()->GetAccountId()); 348 ChromeUserManager::Get()->GetUserImageManager(GetUser()->GetAccountId());
349 int image_index = user_manager::User::USER_IMAGE_INVALID; 349 int image_index = user_manager::User::USER_IMAGE_INVALID;
350 bool waiting_for_camera_photo = false; 350 bool waiting_for_camera_photo = false;
351 351
352 if (image_type == "old") { 352 if (image_type == "old") {
353 // Previous image (from camera or manually uploaded) re-selected. 353 // Previous image (from camera or manually uploaded) re-selected.
354 DCHECK(!previous_image_.isNull()); 354 DCHECK(!previous_image_.isNull());
355 user_image_manager->SaveUserImage( 355 user_image_manager->SaveUserImage(
356 user_manager::UserImage::CreateAndEncode(previous_image_)); 356 user_manager::UserImage::CreateAndEncode(
357 previous_image_, user_manager::UserImage::FORMAT_JPEG));
357 358
358 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", 359 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
359 default_user_image::kHistogramImageOld, 360 default_user_image::kHistogramImageOld,
360 default_user_image::kHistogramImagesCount); 361 default_user_image::kHistogramImagesCount);
361 VLOG(1) << "Selected old user image"; 362 VLOG(1) << "Selected old user image";
362 } else if (image_type == "default" && 363 } else if (image_type == "default" &&
363 default_user_image::IsDefaultImageUrl(image_url, &image_index)) { 364 default_user_image::IsDefaultImageUrl(image_url, &image_index)) {
364 // One of the default user images. 365 // One of the default user images.
365 user_image_manager->SaveUserDefaultImageIndex(image_index); 366 user_image_manager->SaveUserDefaultImageIndex(image_index);
366 367
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", 411 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
411 default_user_image::kHistogramImageFromFile, 412 default_user_image::kHistogramImageFromFile,
412 default_user_image::kHistogramImagesCount); 413 default_user_image::kHistogramImagesCount);
413 VLOG(1) << "Selected image from file"; 414 VLOG(1) << "Selected image from file";
414 } 415 }
415 416
416 void ChangePictureOptionsHandler::SetImageFromCamera( 417 void ChangePictureOptionsHandler::SetImageFromCamera(
417 const gfx::ImageSkia& photo) { 418 const gfx::ImageSkia& photo) {
418 ChromeUserManager::Get() 419 ChromeUserManager::Get()
419 ->GetUserImageManager(GetUser()->GetAccountId()) 420 ->GetUserImageManager(GetUser()->GetAccountId())
420 ->SaveUserImage(user_manager::UserImage::CreateAndEncode(photo)); 421 ->SaveUserImage(user_manager::UserImage::CreateAndEncode(
422 photo, user_manager::UserImage::FORMAT_JPEG));
421 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", 423 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
422 default_user_image::kHistogramImageFromCamera, 424 default_user_image::kHistogramImageFromCamera,
423 default_user_image::kHistogramImagesCount); 425 default_user_image::kHistogramImagesCount);
424 VLOG(1) << "Selected camera photo"; 426 VLOG(1) << "Selected camera photo";
425 } 427 }
426 428
427 void ChangePictureOptionsHandler::SetCameraPresent(bool present) { 429 void ChangePictureOptionsHandler::SetCameraPresent(bool present) {
428 base::FundamentalValue present_value(present); 430 base::FundamentalValue present_value(present);
429 431
430 web_ui()->CallJavascriptFunctionUnsafe( 432 web_ui()->CallJavascriptFunctionUnsafe(
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 Profile* profile = Profile::FromWebUI(web_ui()); 474 Profile* profile = Profile::FromWebUI(web_ui());
473 const user_manager::User* user = 475 const user_manager::User* user =
474 ProfileHelper::Get()->GetUserByProfile(profile); 476 ProfileHelper::Get()->GetUserByProfile(profile);
475 if (!user) 477 if (!user)
476 return user_manager::UserManager::Get()->GetActiveUser(); 478 return user_manager::UserManager::Get()->GetActiveUser();
477 return user; 479 return user;
478 } 480 }
479 481
480 } // namespace options 482 } // namespace options
481 } // namespace chromeos 483 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698