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

Side by Side Diff: chrome/browser/chromeos/login/app_launch_signin_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/chromeos/login/app_launch_signin_screen.h" 5 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/chromeos/login/help_app_launcher.h" 8 #include "chrome/browser/chromeos/login/help_app_launcher.h"
9 #include "chrome/browser/chromeos/login/login_utils.h" 9 #include "chrome/browser/chromeos/login/login_utils.h"
10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" 10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 } 56 }
57 57
58 // static 58 // static
59 void AppLaunchSigninScreen::SetUserManagerForTesting( 59 void AppLaunchSigninScreen::SetUserManagerForTesting(
60 UserManager* user_manager) { 60 UserManager* user_manager) {
61 test_user_manager_ = user_manager; 61 test_user_manager_ = user_manager;
62 } 62 }
63 63
64 UserManager* AppLaunchSigninScreen::GetUserManager() { 64 UserManager* AppLaunchSigninScreen::GetUserManager() {
65 return test_user_manager_ ? test_user_manager_ : UserManager::Get(); 65 return test_user_manager_ ? test_user_manager_ : GetUserManager();
66 } 66 }
67 67
68 void AppLaunchSigninScreen::CancelPasswordChangedFlow() { 68 void AppLaunchSigninScreen::CancelPasswordChangedFlow() {
69 NOTREACHED(); 69 NOTREACHED();
70 } 70 }
71 71
72 void AppLaunchSigninScreen::CancelUserAdding() { 72 void AppLaunchSigninScreen::CancelUserAdding() {
73 NOTREACHED(); 73 NOTREACHED();
74 } 74 }
75 75
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 ScreenlockBridge::LockHandler::AuthType auth_type) { 210 ScreenlockBridge::LockHandler::AuthType auth_type) {
211 return; 211 return;
212 } 212 }
213 213
214 ScreenlockBridge::LockHandler::AuthType AppLaunchSigninScreen::GetAuthType( 214 ScreenlockBridge::LockHandler::AuthType AppLaunchSigninScreen::GetAuthType(
215 const std::string& username) const { 215 const std::string& username) const {
216 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; 216 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
217 } 217 }
218 218
219 } // namespace chromeos 219 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_controller.cc ('k') | chrome/browser/chromeos/login/auth/login_performer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698