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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_image_screen.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) 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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 user_id_ = user_id; 240 user_id_ = user_id;
241 } 241 }
242 242
243 void UserImageScreen::PrepareToShow() { 243 void UserImageScreen::PrepareToShow() {
244 if (actor_) 244 if (actor_)
245 actor_->PrepareToShow(); 245 actor_->PrepareToShow();
246 } 246 }
247 247
248 const User* UserImageScreen::GetUser() { 248 const User* UserImageScreen::GetUser() {
249 if (user_id_.empty()) 249 if (user_id_.empty())
250 return UserManager::Get()->GetLoggedInUser(); 250 return GetUserManager()->GetLoggedInUser();
251 return UserManager::Get()->FindUser(user_id_); 251 return GetUserManager()->FindUser(user_id_);
252 } 252 }
253 253
254 UserImageManager* UserImageScreen::GetUserImageManager() { 254 UserImageManager* UserImageScreen::GetUserImageManager() {
255 return UserManager::Get()->GetUserImageManager(GetUser()->email()); 255 return GetUserManager()->GetUserImageManager(GetUser()->email());
256 } 256 }
257 257
258 UserImageSyncObserver* UserImageScreen::GetSyncObserver() { 258 UserImageSyncObserver* UserImageScreen::GetSyncObserver() {
259 return GetUserImageManager()->GetSyncObserver(); 259 return GetUserImageManager()->GetSyncObserver();
260 } 260 }
261 261
262 void UserImageScreen::Show() { 262 void UserImageScreen::Show() {
263 if (!actor_) 263 if (!actor_)
264 return; 264 return;
265 265
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 380
381 void UserImageScreen::ExitScreen() { 381 void UserImageScreen::ExitScreen() {
382 policy_registrar_.reset(); 382 policy_registrar_.reset();
383 sync_timer_.reset(); 383 sync_timer_.reset();
384 if (UserImageSyncObserver* sync_observer = GetSyncObserver()) 384 if (UserImageSyncObserver* sync_observer = GetSyncObserver())
385 sync_observer->RemoveObserver(this); 385 sync_observer->RemoveObserver(this);
386 get_screen_observer()->OnExit(ScreenObserver::USER_IMAGE_SELECTED); 386 get_screen_observer()->OnExit(ScreenObserver::USER_IMAGE_SELECTED);
387 } 387 }
388 388
389 } // namespace chromeos 389 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698