OLD | NEW |
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/user_manager.h" | 5 #include "chrome/browser/chromeos/login/user_manager.h" |
6 | 6 |
7 #include "base/synchronization/lock.h" | 7 #include "base/synchronization/lock.h" |
8 #include "chrome/browser/chromeos/login/user_manager_impl.h" | 8 #include "chrome/browser/chromeos/login/user_manager_impl.h" |
9 #include "chrome/browser/prefs/pref_service.h" | 9 #include "chrome/browser/prefs/pref_service.h" |
10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
11 | 11 |
12 namespace chromeos { | 12 namespace chromeos { |
13 | 13 |
14 // static | 14 // static |
15 const char UserManager::kLoggedInUsers[] = "LoggedInUsers"; | 15 const char UserManager::kLoggedInUsers[] = "LoggedInUsers"; |
16 const char UserManager::kUserWallpapers[] = "UserWallpapers"; | 16 const char UserManager::kUserWallpapers[] = "UserWallpapers"; |
| 17 const char UserManager::kUserWallpapersProperties[] = |
| 18 "UserWallpapersProperties"; |
17 const char UserManager::kUserImages[] = "UserImages"; | 19 const char UserManager::kUserImages[] = "UserImages"; |
18 const char UserManager::kUserDisplayEmail[] = "UserDisplayEmail"; | 20 const char UserManager::kUserDisplayEmail[] = "UserDisplayEmail"; |
19 const char UserManager::kUserOAuthTokenStatus[] = "OAuthTokenStatus"; | 21 const char UserManager::kUserOAuthTokenStatus[] = "OAuthTokenStatus"; |
20 | 22 |
21 // Class that is holds pointer to UserManager instance. | 23 // Class that is holds pointer to UserManager instance. |
22 // One could set UserManager mock instance through it (see UserManager::Set). | 24 // One could set UserManager mock instance through it (see UserManager::Set). |
23 class UserManagerImplWrapper { | 25 class UserManagerImplWrapper { |
24 public: | 26 public: |
25 static UserManagerImplWrapper* GetInstance() { | 27 static UserManagerImplWrapper* GetInstance() { |
26 return Singleton<UserManagerImplWrapper>::get(); | 28 return Singleton<UserManagerImplWrapper>::get(); |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 UserManager* old_manager = UserManagerImplWrapper::GetInstance()->release(); | 73 UserManager* old_manager = UserManagerImplWrapper::GetInstance()->release(); |
72 UserManagerImplWrapper::GetInstance()->reset(mock); | 74 UserManagerImplWrapper::GetInstance()->reset(mock); |
73 return old_manager; | 75 return old_manager; |
74 } | 76 } |
75 | 77 |
76 // static | 78 // static |
77 void UserManager::RegisterPrefs(PrefService* local_state) { | 79 void UserManager::RegisterPrefs(PrefService* local_state) { |
78 local_state->RegisterListPref(kLoggedInUsers, PrefService::UNSYNCABLE_PREF); | 80 local_state->RegisterListPref(kLoggedInUsers, PrefService::UNSYNCABLE_PREF); |
79 local_state->RegisterDictionaryPref(kUserWallpapers, | 81 local_state->RegisterDictionaryPref(kUserWallpapers, |
80 PrefService::UNSYNCABLE_PREF); | 82 PrefService::UNSYNCABLE_PREF); |
| 83 local_state->RegisterDictionaryPref(kUserWallpapersProperties, |
| 84 PrefService::UNSYNCABLE_PREF); |
81 local_state->RegisterDictionaryPref(kUserImages, | 85 local_state->RegisterDictionaryPref(kUserImages, |
82 PrefService::UNSYNCABLE_PREF); | 86 PrefService::UNSYNCABLE_PREF); |
83 local_state->RegisterDictionaryPref(kUserOAuthTokenStatus, | 87 local_state->RegisterDictionaryPref(kUserOAuthTokenStatus, |
84 PrefService::UNSYNCABLE_PREF); | 88 PrefService::UNSYNCABLE_PREF); |
85 local_state->RegisterDictionaryPref(kUserDisplayEmail, | 89 local_state->RegisterDictionaryPref(kUserDisplayEmail, |
86 PrefService::UNSYNCABLE_PREF); | 90 PrefService::UNSYNCABLE_PREF); |
87 } | 91 } |
88 | 92 |
89 UserManager::~UserManager() { | 93 UserManager::~UserManager() { |
90 } | 94 } |
91 | 95 |
92 } // namespace chromeos | 96 } // namespace chromeos |
OLD | NEW |