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

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

Issue 931993002: Make image_decoder a Leaky LazyInstance (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename instance_ to image_decoder_instance_ for mac linker Created 5 years, 10 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
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 manager->Initialize(SOUND_OBJECT_DELETE, 91 manager->Initialize(SOUND_OBJECT_DELETE,
92 bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV)); 92 bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV));
93 manager->Initialize(SOUND_CAMERA_SNAP, 93 manager->Initialize(SOUND_CAMERA_SNAP,
94 bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV)); 94 bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV));
95 } 95 }
96 96
97 ChangePictureOptionsHandler::~ChangePictureOptionsHandler() { 97 ChangePictureOptionsHandler::~ChangePictureOptionsHandler() {
98 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); 98 CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
99 if (select_file_dialog_.get()) 99 if (select_file_dialog_.get())
100 select_file_dialog_->ListenerDestroyed(); 100 select_file_dialog_->ListenerDestroyed();
101 if (image_decoder_.get())
102 image_decoder_->set_delegate(NULL);
103 } 101 }
104 102
105 void ChangePictureOptionsHandler::GetLocalizedValues( 103 void ChangePictureOptionsHandler::GetLocalizedValues(
106 base::DictionaryValue* localized_strings) { 104 base::DictionaryValue* localized_strings) {
107 DCHECK(localized_strings); 105 DCHECK(localized_strings);
108 localized_strings->SetString("changePicturePage", 106 localized_strings->SetString("changePicturePage",
109 l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TITLE)); 107 l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TITLE));
110 localized_strings->SetString("changePicturePageDescription", 108 localized_strings->SetString("changePicturePageDescription",
111 l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT)); 109 l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT));
112 localized_strings->SetString("takePhoto", 110 localized_strings->SetString("takePhoto",
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 DCHECK(!image_url.empty()); 231 DCHECK(!image_url.empty());
234 232
235 std::string mime_type, charset, raw_data; 233 std::string mime_type, charset, raw_data;
236 if (!net::DataURL::Parse(GURL(image_url), &mime_type, &charset, &raw_data)) 234 if (!net::DataURL::Parse(GURL(image_url), &mime_type, &charset, &raw_data))
237 NOTREACHED(); 235 NOTREACHED();
238 DCHECK_EQ("image/png", mime_type); 236 DCHECK_EQ("image/png", mime_type);
239 237
240 user_photo_ = gfx::ImageSkia(); 238 user_photo_ = gfx::ImageSkia();
241 user_photo_data_url_ = image_url; 239 user_photo_data_url_ = image_url;
242 240
243 if (image_decoder_.get())
244 image_decoder_->set_delegate(NULL);
245 image_decoder_ = new ImageDecoder(this, raw_data,
246 ImageDecoder::DEFAULT_CODEC);
247 scoped_refptr<base::MessageLoopProxy> task_runner = 241 scoped_refptr<base::MessageLoopProxy> task_runner =
248 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI); 242 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
249 image_decoder_->Start(task_runner); 243 ImageDecoder::GetInstance()->Start(this, raw_data,
244 ImageDecoder::DEFAULT_CODEC,
245 task_runner);
250 } 246 }
251 247
252 void ChangePictureOptionsHandler::HandlePageInitialized( 248 void ChangePictureOptionsHandler::HandlePageInitialized(
253 const base::ListValue* args) { 249 const base::ListValue* args) {
254 DCHECK(args && args->empty()); 250 DCHECK(args && args->empty());
255 SendDefaultImages(); 251 SendDefaultImages();
256 } 252 }
257 253
258 void ChangePictureOptionsHandler::HandlePageShown(const base::ListValue* args) { 254 void ChangePictureOptionsHandler::HandlePageShown(const base::ListValue* args) {
259 DCHECK(args && args->empty()); 255 DCHECK(args && args->empty());
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 user_image_manager->SaveUserDefaultImageIndex(image_index); 359 user_image_manager->SaveUserDefaultImageIndex(image_index);
364 360
365 UMA_HISTOGRAM_ENUMERATION( 361 UMA_HISTOGRAM_ENUMERATION(
366 "UserImage.ChangeChoice", 362 "UserImage.ChangeChoice",
367 user_manager::GetDefaultImageHistogramValue(image_index), 363 user_manager::GetDefaultImageHistogramValue(image_index),
368 user_manager::kHistogramImagesCount); 364 user_manager::kHistogramImagesCount);
369 VLOG(1) << "Selected default user image: " << image_index; 365 VLOG(1) << "Selected default user image: " << image_index;
370 } else if (image_type == "camera") { 366 } else if (image_type == "camera") {
371 // Camera image is selected. 367 // Camera image is selected.
372 if (user_photo_.isNull()) { 368 if (user_photo_.isNull()) {
373 DCHECK(image_decoder_.get());
374 waiting_for_camera_photo = true; 369 waiting_for_camera_photo = true;
375 VLOG(1) << "Still waiting for camera image to decode"; 370 VLOG(1) << "Still waiting for camera image to decode";
376 } else { 371 } else {
377 SetImageFromCamera(user_photo_); 372 SetImageFromCamera(user_photo_);
378 } 373 }
379 } else if (image_type == "profile") { 374 } else if (image_type == "profile") {
380 // Profile image selected. Could be previous (old) user image. 375 // Profile image selected. Could be previous (old) user image.
381 user_image_manager->SaveUserImageFromProfileImage(); 376 user_image_manager->SaveUserImageFromProfileImage();
382 377
383 if (previous_image_index_ == user_manager::User::USER_IMAGE_PROFILE) { 378 if (previous_image_index_ == user_manager::User::USER_IMAGE_PROFILE) {
384 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", 379 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
385 user_manager::kHistogramImageOld, 380 user_manager::kHistogramImageOld,
386 user_manager::kHistogramImagesCount); 381 user_manager::kHistogramImagesCount);
387 VLOG(1) << "Selected old (profile) user image"; 382 VLOG(1) << "Selected old (profile) user image";
388 } else { 383 } else {
389 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", 384 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
390 user_manager::kHistogramImageFromProfile, 385 user_manager::kHistogramImageFromProfile,
391 user_manager::kHistogramImagesCount); 386 user_manager::kHistogramImagesCount);
392 VLOG(1) << "Selected profile image"; 387 VLOG(1) << "Selected profile image";
393 } 388 }
394 } else { 389 } else {
395 NOTREACHED() << "Unexpected image type: " << image_type; 390 NOTREACHED() << "Unexpected image type: " << image_type;
396 } 391 }
397
398 // Ignore the result of the previous decoding if it's no longer needed.
399 if (!waiting_for_camera_photo && image_decoder_.get())
400 image_decoder_->set_delegate(NULL);
401 } 392 }
402 393
403 void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path, 394 void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path,
404 int index, 395 int index,
405 void* params) { 396 void* params) {
406 ChromeUserManager::Get() 397 ChromeUserManager::Get()
407 ->GetUserImageManager(GetUser()->email()) 398 ->GetUserImageManager(GetUser()->email())
408 ->SaveUserImageFromFile(path); 399 ->SaveUserImageFromFile(path);
409 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", 400 UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
410 user_manager::kHistogramImageFromFile, 401 user_manager::kHistogramImageFromFile,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 } 442 }
452 } 443 }
453 444
454 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const { 445 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {
455 Browser* browser = 446 Browser* browser =
456 chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); 447 chrome::FindBrowserWithWebContents(web_ui()->GetWebContents());
457 return browser->window()->GetNativeWindow(); 448 return browser->window()->GetNativeWindow();
458 } 449 }
459 450
460 void ChangePictureOptionsHandler::OnImageDecoded( 451 void ChangePictureOptionsHandler::OnImageDecoded(
461 const ImageDecoder* decoder,
462 const SkBitmap& decoded_image) { 452 const SkBitmap& decoded_image) {
463 DCHECK_EQ(image_decoder_.get(), decoder);
464 image_decoder_ = NULL;
465 user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image); 453 user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
466 SetImageFromCamera(user_photo_); 454 SetImageFromCamera(user_photo_);
467 } 455 }
468 456
469 void ChangePictureOptionsHandler::OnDecodeImageFailed( 457 void ChangePictureOptionsHandler::OnDecodeImageFailed() {
470 const ImageDecoder* decoder) {
471 NOTREACHED() << "Failed to decode PNG image from WebUI"; 458 NOTREACHED() << "Failed to decode PNG image from WebUI";
472 } 459 }
473 460
474 const user_manager::User* ChangePictureOptionsHandler::GetUser() const { 461 const user_manager::User* ChangePictureOptionsHandler::GetUser() const {
475 Profile* profile = Profile::FromWebUI(web_ui()); 462 Profile* profile = Profile::FromWebUI(web_ui());
476 const user_manager::User* user = 463 const user_manager::User* user =
477 ProfileHelper::Get()->GetUserByProfile(profile); 464 ProfileHelper::Get()->GetUserByProfile(profile);
478 if (!user) 465 if (!user)
479 return user_manager::UserManager::Get()->GetActiveUser(); 466 return user_manager::UserManager::Get()->GetActiveUser();
480 return user; 467 return user;
481 } 468 }
482 469
483 } // namespace options 470 } // namespace options
484 } // namespace chromeos 471 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698