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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Issue 1049873005: [chrome/browser/chromeos/] favor DCHECK_CURRENTLY_ON for better logs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/supervised/supervised_user_creation_scre en.h" 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 ui_copy->SetString("id", it.key()); 582 ui_copy->SetString("id", it.key());
583 583
584 existing_users_->Set(it.key(), local_copy); 584 existing_users_->Set(it.key(), local_copy);
585 ui_users->Append(ui_copy); 585 ui_users->Append(ui_copy);
586 } 586 }
587 actor_->ShowExistingSupervisedUsers(ui_users.get()); 587 actor_->ShowExistingSupervisedUsers(ui_users.get());
588 } 588 }
589 589
590 void SupervisedUserCreationScreen::OnPhotoTaken( 590 void SupervisedUserCreationScreen::OnPhotoTaken(
591 const std::string& raw_data) { 591 const std::string& raw_data) {
592 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 592 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
593 user_photo_ = gfx::ImageSkia(); 593 user_photo_ = gfx::ImageSkia();
594 ImageDecoder::Cancel(this); 594 ImageDecoder::Cancel(this);
595 ImageDecoder::Start(this, raw_data); 595 ImageDecoder::Start(this, raw_data);
596 } 596 }
597 597
598 void SupervisedUserCreationScreen::OnImageDecoded( 598 void SupervisedUserCreationScreen::OnImageDecoded(
599 const SkBitmap& decoded_image) { 599 const SkBitmap& decoded_image) {
600 user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image); 600 user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
601 if (apply_photo_after_decoding_) 601 if (apply_photo_after_decoding_)
602 ApplyPicture(); 602 ApplyPicture();
(...skipping 16 matching lines...) Expand all
619 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 619 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
620 } else { 620 } else {
621 NOTREACHED() << "Unexpected image type: " << image_type; 621 NOTREACHED() << "Unexpected image type: " << image_type;
622 } 622 }
623 } 623 }
624 624
625 void SupervisedUserCreationScreen::OnImageAccepted() { 625 void SupervisedUserCreationScreen::OnImageAccepted() {
626 } 626 }
627 627
628 } // namespace chromeos 628 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698