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

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: Rebase 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 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 } 920 }
921 921
922 void UserManagerImpl::NotifyLocalStateChanged() { 922 void UserManagerImpl::NotifyLocalStateChanged() {
923 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 923 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
924 FOR_EACH_OBSERVER(UserManager::Observer, observer_list_, 924 FOR_EACH_OBSERVER(UserManager::Observer, observer_list_,
925 LocalStateChanged(this)); 925 LocalStateChanged(this));
926 } 926 }
927 927
928 void UserManagerImpl::EnsureUsersLoaded() { 928 void UserManagerImpl::EnsureUsersLoaded() {
929 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 929 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
930 if (!g_browser_process) 930 if (!g_browser_process || !g_browser_process->local_state())
931 return; 931 return;
932 932
933 if (users_loaded_) 933 if (users_loaded_)
934 return; 934 return;
935 users_loaded_ = true; 935 users_loaded_ = true;
936 936
937 // Clean up user list first. 937 // Clean up user list first.
938 if (HasFailedLocallyManagedUserCreationTransaction()) 938 if (HasFailedLocallyManagedUserCreationTransaction())
939 RollbackLocallyManagedUserCreationTransaction(); 939 RollbackLocallyManagedUserCreationTransaction();
940 940
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
1386 content::NotificationService::NoDetails()); 1386 content::NotificationService::NoDetails());
1387 } 1387 }
1388 1388
1389 void UserManagerImpl::NotifyMergeSessionStateChanged() { 1389 void UserManagerImpl::NotifyMergeSessionStateChanged() {
1390 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1390 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1391 FOR_EACH_OBSERVER(UserManager::Observer, observer_list_, 1391 FOR_EACH_OBSERVER(UserManager::Observer, observer_list_,
1392 MergeSessionStateChanged(merge_session_state_)); 1392 MergeSessionStateChanged(merge_session_state_));
1393 } 1393 }
1394 1394
1395 } // namespace chromeos 1395 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698