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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

Issue 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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) 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/ui/webui/chromeos/login/user_image_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 } 261 }
262 } 262 }
263 263
264 void UserImageScreenHandler::HandleImageAccepted(const base::ListValue* args) { 264 void UserImageScreenHandler::HandleImageAccepted(const base::ListValue* args) {
265 DCHECK(args && args->empty()); 265 DCHECK(args && args->empty());
266 if (!screen_) 266 if (!screen_)
267 return; 267 return;
268 switch (selected_image_) { 268 switch (selected_image_) {
269 case User::kExternalImageIndex: 269 case User::kExternalImageIndex:
270 // Photo decoding may not have been finished yet. 270 // Photo decoding may not have been finished yet.
271 if (user_photo_.empty()) 271 if (user_photo_.isNull())
272 accept_photo_after_decoding_ = true; 272 accept_photo_after_decoding_ = true;
273 else 273 else
274 screen_->OnPhotoTaken(user_photo_); 274 screen_->OnPhotoTaken(user_photo_);
275 break; 275 break;
276 276
277 case User::kProfileImageIndex: 277 case User::kProfileImageIndex:
278 screen_->OnProfileImageSelected(); 278 screen_->OnProfileImageSelected();
279 break; 279 break;
280 280
281 default: 281 default:
(...skipping 24 matching lines...) Expand all
306 user_photo_ = gfx::ImageSkia(decoded_image); 306 user_photo_ = gfx::ImageSkia(decoded_image);
307 if (screen_ && accept_photo_after_decoding_) 307 if (screen_ && accept_photo_after_decoding_)
308 screen_->OnPhotoTaken(user_photo_); 308 screen_->OnPhotoTaken(user_photo_);
309 } 309 }
310 310
311 void UserImageScreenHandler::OnDecodeImageFailed(const ImageDecoder* decoder) { 311 void UserImageScreenHandler::OnDecodeImageFailed(const ImageDecoder* decoder) {
312 NOTREACHED() << "Failed to decode PNG image from WebUI"; 312 NOTREACHED() << "Failed to decode PNG image from WebUI";
313 } 313 }
314 314
315 } // namespace chromeos 315 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698