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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 months 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 | Annotate | Revision Log
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 "ash/audio/sounds.h" 7 #include "ash/audio/sounds.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 void ChangePictureOptionsHandler::SendProfileImage(const gfx::ImageSkia& image, 299 void ChangePictureOptionsHandler::SendProfileImage(const gfx::ImageSkia& image,
300 bool should_select) { 300 bool should_select) {
301 base::StringValue data_url(webui::GetBitmapDataUrl(*image.bitmap())); 301 base::StringValue data_url(webui::GetBitmapDataUrl(*image.bitmap()));
302 base::FundamentalValue select(should_select); 302 base::FundamentalValue select(should_select);
303 web_ui()->CallJavascriptFunction("ChangePictureOptions.setProfileImage", 303 web_ui()->CallJavascriptFunction("ChangePictureOptions.setProfileImage",
304 data_url, select); 304 data_url, select);
305 } 305 }
306 306
307 void ChangePictureOptionsHandler::UpdateProfileImage() { 307 void ChangePictureOptionsHandler::UpdateProfileImage() {
308 UserImageManager* user_image_manager = 308 UserImageManager* user_image_manager =
309 UserManager::Get()->GetUserImageManager(GetUser()->email()); 309 GetUserManager()->GetUserImageManager(GetUser()->email());
310 // If we have a downloaded profile image and haven't sent it in 310 // If we have a downloaded profile image and haven't sent it in
311 // |SendSelectedImage|, send it now (without selecting). 311 // |SendSelectedImage|, send it now (without selecting).
312 if (previous_image_index_ != User::kProfileImageIndex && 312 if (previous_image_index_ != User::kProfileImageIndex &&
313 !user_image_manager->DownloadedProfileImage().isNull()) 313 !user_image_manager->DownloadedProfileImage().isNull())
314 SendProfileImage(user_image_manager->DownloadedProfileImage(), false); 314 SendProfileImage(user_image_manager->DownloadedProfileImage(), false);
315 315
316 user_image_manager->DownloadProfileImage(kProfileDownloadReason); 316 user_image_manager->DownloadProfileImage(kProfileDownloadReason);
317 } 317 }
318 318
319 void ChangePictureOptionsHandler::SendOldImage(const std::string& image_url) { 319 void ChangePictureOptionsHandler::SendOldImage(const std::string& image_url) {
(...skipping 10 matching lines...) Expand all
330 args->GetSize() != 2 || 330 args->GetSize() != 2 ||
331 !args->GetString(0, &image_url) || 331 !args->GetString(0, &image_url) ||
332 !args->GetString(1, &image_type)) { 332 !args->GetString(1, &image_type)) {
333 NOTREACHED(); 333 NOTREACHED();
334 return; 334 return;
335 } 335 }
336 DCHECK(!image_url.empty()); 336 DCHECK(!image_url.empty());
337 DCHECK(!image_type.empty()); 337 DCHECK(!image_type.empty());
338 338
339 UserImageManager* user_image_manager = 339 UserImageManager* user_image_manager =
340 UserManager::Get()->GetUserImageManager(GetUser()->email()); 340 GetUserManager()->GetUserImageManager(GetUser()->email());
341 int image_index = User::kInvalidImageIndex; 341 int image_index = User::kInvalidImageIndex;
342 bool waiting_for_camera_photo = false; 342 bool waiting_for_camera_photo = false;
343 343
344 if (image_type == "old") { 344 if (image_type == "old") {
345 // Previous image (from camera or manually uploaded) re-selected. 345 // Previous image (from camera or manually uploaded) re-selected.
346 DCHECK(!previous_image_.isNull()); 346 DCHECK(!previous_image_.isNull());
347 user_image_manager->SaveUserImage( 347 user_image_manager->SaveUserImage(
348 UserImage::CreateAndEncode(previous_image_)); 348 UserImage::CreateAndEncode(previous_image_));
349 349
350 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", 350 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 } 389 }
390 390
391 // Ignore the result of the previous decoding if it's no longer needed. 391 // Ignore the result of the previous decoding if it's no longer needed.
392 if (!waiting_for_camera_photo && image_decoder_.get()) 392 if (!waiting_for_camera_photo && image_decoder_.get())
393 image_decoder_->set_delegate(NULL); 393 image_decoder_->set_delegate(NULL);
394 } 394 }
395 395
396 void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path, 396 void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path,
397 int index, 397 int index,
398 void* params) { 398 void* params) {
399 UserManager* user_manager = UserManager::Get(); 399 UserManager* user_manager = GetUserManager();
400 user_manager->GetUserImageManager(GetUser()->email())-> 400 user_manager->GetUserImageManager(GetUser()->email())->
401 SaveUserImageFromFile(path); 401 SaveUserImageFromFile(path);
402 UMA_HISTOGRAM_ENUMERATION( 402 UMA_HISTOGRAM_ENUMERATION(
403 "UserImage.ChangeChoice", kHistogramImageFromFile, kHistogramImagesCount); 403 "UserImage.ChangeChoice", kHistogramImageFromFile, kHistogramImagesCount);
404 VLOG(1) << "Selected image from file"; 404 VLOG(1) << "Selected image from file";
405 } 405 }
406 406
407 void ChangePictureOptionsHandler::SetImageFromCamera( 407 void ChangePictureOptionsHandler::SetImageFromCamera(
408 const gfx::ImageSkia& photo) { 408 const gfx::ImageSkia& photo) {
409 UserManager* user_manager = UserManager::Get(); 409 UserManager* user_manager = GetUserManager();
410 user_manager->GetUserImageManager(GetUser()->email())->SaveUserImage( 410 user_manager->GetUserImageManager(GetUser()->email())->SaveUserImage(
411 UserImage::CreateAndEncode(photo)); 411 UserImage::CreateAndEncode(photo));
412 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", 412 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
413 kHistogramImageFromCamera, 413 kHistogramImageFromCamera,
414 kHistogramImagesCount); 414 kHistogramImagesCount);
415 VLOG(1) << "Selected camera photo"; 415 VLOG(1) << "Selected camera photo";
416 } 416 }
417 417
418 void ChangePictureOptionsHandler::SetCameraPresent(bool present) { 418 void ChangePictureOptionsHandler::SetCameraPresent(bool present) {
419 base::FundamentalValue present_value(present); 419 base::FundamentalValue present_value(present);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 460
461 void ChangePictureOptionsHandler::OnDecodeImageFailed( 461 void ChangePictureOptionsHandler::OnDecodeImageFailed(
462 const ImageDecoder* decoder) { 462 const ImageDecoder* decoder) {
463 NOTREACHED() << "Failed to decode PNG image from WebUI"; 463 NOTREACHED() << "Failed to decode PNG image from WebUI";
464 } 464 }
465 465
466 User* ChangePictureOptionsHandler::GetUser() const { 466 User* ChangePictureOptionsHandler::GetUser() const {
467 Profile* profile = Profile::FromWebUI(web_ui()); 467 Profile* profile = Profile::FromWebUI(web_ui());
468 User* user = ProfileHelper::Get()->GetUserByProfile(profile); 468 User* user = ProfileHelper::Get()->GetUserByProfile(profile);
469 if (!user) 469 if (!user)
470 return UserManager::Get()->GetActiveUser(); 470 return GetUserManager()->GetActiveUser();
471 return user; 471 return user;
472 } 472 }
473 473
474 } // namespace options 474 } // namespace options
475 } // namespace chromeos 475 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698