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

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

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix LoginUtilsTest Created 7 years, 8 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/user_manager_impl.h" 5 #include "chrome/browser/chromeos/login/user_manager_impl.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 } 849 }
850 850
851 void UserManagerImpl::NotifyLocalStateChanged() { 851 void UserManagerImpl::NotifyLocalStateChanged() {
852 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 852 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
853 FOR_EACH_OBSERVER(UserManager::Observer, observer_list_, 853 FOR_EACH_OBSERVER(UserManager::Observer, observer_list_,
854 LocalStateChanged(this)); 854 LocalStateChanged(this));
855 } 855 }
856 856
857 void UserManagerImpl::EnsureUsersLoaded() { 857 void UserManagerImpl::EnsureUsersLoaded() {
858 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 858 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
859 if (!g_browser_process) 859 if (!g_browser_process || !g_browser_process->local_state())
860 return; 860 return;
861 861
862 if (users_loaded_) 862 if (users_loaded_)
863 return; 863 return;
864 users_loaded_ = true; 864 users_loaded_ = true;
865 865
866 // Clean up user list first. 866 // Clean up user list first.
867 if (HasFailedLocallyManagedUserCreationTransaction()) 867 if (HasFailedLocallyManagedUserCreationTransaction())
868 RollbackLocallyManagedUserCreationTransaction(); 868 RollbackLocallyManagedUserCreationTransaction();
869 869
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 content::NotificationService::NoDetails()); 1294 content::NotificationService::NoDetails());
1295 } 1295 }
1296 1296
1297 void UserManagerImpl::NotifyMergeSessionStateChanged() { 1297 void UserManagerImpl::NotifyMergeSessionStateChanged() {
1298 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1298 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1299 FOR_EACH_OBSERVER(UserManager::Observer, observer_list_, 1299 FOR_EACH_OBSERVER(UserManager::Observer, observer_list_,
1300 MergeSessionStateChanged(merge_session_state_)); 1300 MergeSessionStateChanged(merge_session_state_));
1301 } 1301 }
1302 1302
1303 } // namespace chromeos 1303 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698