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

Side by Side Diff: chrome/browser/chromeos/login/mock_user_manager.cc

Issue 23095006: If user profile doesn't contain language setting, default to his Google account settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Multi Profile support. Created 7 years, 3 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/mock_user_manager.h" 5 #include "chrome/browser/chromeos/login/mock_user_manager.h"
6 6
7 namespace chromeos { 7 namespace chromeos {
8 8
9 MockUserManager::MockUserManager() : user_(NULL), 9 MockUserManager::MockUserManager() : user_(NULL),
10 user_flow_(new DefaultUserFlow()) {} 10 user_flow_(new DefaultUserFlow()) {}
(...skipping 11 matching lines...) Expand all
22 } 22 }
23 23
24 const User* MockUserManager::GetActiveUser() const { 24 const User* MockUserManager::GetActiveUser() const {
25 return user_; 25 return user_;
26 } 26 }
27 27
28 User* MockUserManager::GetActiveUser() { 28 User* MockUserManager::GetActiveUser() {
29 return user_; 29 return user_;
30 } 30 }
31 31
32 const User* MockUserManager::GetPrimaryUser() const {
33 return user_;
34 }
35
32 UserImageManager* MockUserManager::GetUserImageManager() { 36 UserImageManager* MockUserManager::GetUserImageManager() {
33 return user_image_manager_.get(); 37 return user_image_manager_.get();
34 } 38 }
35 39
36 // Creates a new User instance. 40 // Creates a new User instance.
37 void MockUserManager::SetActiveUser(const std::string& email) { 41 void MockUserManager::SetActiveUser(const std::string& email) {
38 delete user_; 42 delete user_;
39 user_ = User::CreateRegularUser(email); 43 user_ = User::CreateRegularUser(email);
40 } 44 }
41 45
42 UserFlow* MockUserManager::GetCurrentUserFlow() const { 46 UserFlow* MockUserManager::GetCurrentUserFlow() const {
43 return user_flow_.get(); 47 return user_flow_.get();
44 } 48 }
45 49
46 UserFlow* MockUserManager::GetUserFlow(const std::string&) const { 50 UserFlow* MockUserManager::GetUserFlow(const std::string&) const {
47 return user_flow_.get(); 51 return user_flow_.get();
48 } 52 }
49 53
50 User* MockUserManager::CreatePublicAccountUser(const std::string& email) { 54 User* MockUserManager::CreatePublicAccountUser(const std::string& email) {
51 delete user_; 55 delete user_;
52 user_ = User::CreatePublicAccountUser(email); 56 user_ = User::CreatePublicAccountUser(email);
53 return user_; 57 return user_;
54 } 58 }
55 59
56 } // namespace chromeos 60 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698