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

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.h

Issue 971383002: Removing FRE UI for unicorn accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments addressed. Created 5 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 OAuth2LoginManager::SessionRestoreState state) override; 240 OAuth2LoginManager::SessionRestoreState state) override;
241 241
242 // net::NetworkChangeNotifier::ConnectionTypeObserver overrides: 242 // net::NetworkChangeNotifier::ConnectionTypeObserver overrides:
243 void OnConnectionTypeChanged( 243 void OnConnectionTypeChanged(
244 net::NetworkChangeNotifier::ConnectionType type) override; 244 net::NetworkChangeNotifier::ConnectionType type) override;
245 245
246 // UserSessionManagerDelegate overrides: 246 // UserSessionManagerDelegate overrides:
247 // Used when restoring user sessions after crash. 247 // Used when restoring user sessions after crash.
248 void OnProfilePrepared(Profile* profile, bool browser_launched) override; 248 void OnProfilePrepared(Profile* profile, bool browser_launched) override;
249 249
250 void ChildAccountStatusReceivedCallback();
251
252 void StopStatusObserving();
Denis Kuznetsov (DE-MUC) 2015/03/10 14:40:34 Maybe call it StopChildStatusObserving()? Name (es
merkulova 2015/03/10 15:00:37 Done.
253
250 void CreateUserSession(const UserContext& user_context, 254 void CreateUserSession(const UserContext& user_context,
251 bool has_auth_cookies); 255 bool has_auth_cookies);
252 void PreStartSession(); 256 void PreStartSession();
253 void StartCrosSession(); 257 void StartCrosSession();
254 void NotifyUserLoggedIn(); 258 void NotifyUserLoggedIn();
255 void PrepareProfile(); 259 void PrepareProfile();
256 260
257 // Callback for asynchronous profile creation. 261 // Callback for asynchronous profile creation.
258 void OnProfileCreated(const UserContext& user_context, 262 void OnProfileCreated(const UserContext& user_context,
259 bool is_incognito_profile, 263 bool is_incognito_profile,
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 ProfileCompare> default_ime_states_; 409 ProfileCompare> default_ime_states_;
406 410
407 // Manages Easy unlock cryptohome keys. 411 // Manages Easy unlock cryptohome keys.
408 scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_; 412 scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_;
409 bool running_easy_unlock_key_ops_; 413 bool running_easy_unlock_key_ops_;
410 base::Closure easy_unlock_key_ops_finished_callback_; 414 base::Closure easy_unlock_key_ops_finished_callback_;
411 415
412 // Whether should launch browser, tests may override this value. 416 // Whether should launch browser, tests may override this value.
413 bool should_launch_browser_; 417 bool should_launch_browser_;
414 418
419 // Whether we have postponed request for InitializeStartUrls call.
420 bool init_start_urls_was_postponed_;
421
422 base::WeakPtrFactory<UserSessionManager> weak_factory_;
423
415 DISALLOW_COPY_AND_ASSIGN(UserSessionManager); 424 DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
416 }; 425 };
417 426
418 } // namespace chromeos 427 } // namespace chromeos
419 428
420 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 429 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698