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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_image_screen.cc

Issue 1036723003: favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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) 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/chromeos/login/screens/user_image_screen.h" 5 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
6 6
7 #include <string> 7 #include <string>
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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 image_decoder_->set_delegate(NULL); 93 image_decoder_->set_delegate(NULL);
94 } 94 }
95 95
96 void UserImageScreen::OnScreenReady() { 96 void UserImageScreen::OnScreenReady() {
97 is_screen_ready_ = true; 97 is_screen_ready_ = true;
98 if (!IsWaitingForSync()) 98 if (!IsWaitingForSync())
99 HideCurtain(); 99 HideCurtain();
100 } 100 }
101 101
102 void UserImageScreen::OnPhotoTaken(const std::string& raw_data) { 102 void UserImageScreen::OnPhotoTaken(const std::string& raw_data) {
103 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 103 DCHECK_CURRENTLY_ON(BrowserThread::UI);
104 user_photo_ = gfx::ImageSkia(); 104 user_photo_ = gfx::ImageSkia();
105 if (image_decoder_.get()) 105 if (image_decoder_.get())
106 image_decoder_->set_delegate(NULL); 106 image_decoder_->set_delegate(NULL);
107 image_decoder_ = new ImageDecoder(this, raw_data, 107 image_decoder_ = new ImageDecoder(this, raw_data,
108 ImageDecoder::DEFAULT_CODEC); 108 ImageDecoder::DEFAULT_CODEC);
109 scoped_refptr<base::MessageLoopProxy> task_runner = 109 scoped_refptr<base::MessageLoopProxy> task_runner =
110 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI); 110 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
111 image_decoder_->Start(task_runner); 111 image_decoder_->Start(task_runner);
112 } 112 }
113 113
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 345
346 void UserImageScreen::ExitScreen() { 346 void UserImageScreen::ExitScreen() {
347 policy_registrar_.reset(); 347 policy_registrar_.reset();
348 sync_timer_.reset(); 348 sync_timer_.reset();
349 if (UserImageSyncObserver* sync_observer = GetSyncObserver()) 349 if (UserImageSyncObserver* sync_observer = GetSyncObserver())
350 sync_observer->RemoveObserver(this); 350 sync_observer->RemoveObserver(this);
351 Finish(BaseScreenDelegate::USER_IMAGE_SELECTED); 351 Finish(BaseScreenDelegate::USER_IMAGE_SELECTED);
352 } 352 }
353 353
354 } // namespace chromeos 354 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698