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

Unified 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: Added preference. Comments addressed. Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/session/user_session_manager.h
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
index 88f9118f19b0eeb301e584081ca1fbc75a2a8b77..dccc9db41390bd941e0f45ffb2eaaeadc73624fd 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -15,6 +15,7 @@
#include "base/observer_list.h"
#include "chrome/browser/chromeos/base/locale_util.h"
#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
+#include "chrome/browser/supervised_user/child_accounts/child_account_status_observer.h"
#include "chromeos/dbus/session_manager_client.h"
#include "chromeos/login/auth/authenticator.h"
#include "chromeos/login/auth/user_context.h"
@@ -75,7 +76,8 @@ class UserSessionManager
public net::NetworkChangeNotifier::ConnectionTypeObserver,
public base::SupportsWeakPtr<UserSessionManager>,
public UserSessionManagerDelegate,
- public user_manager::UserManager::UserSessionStateObserver {
+ public user_manager::UserManager::UserSessionStateObserver,
+ public ChildAccountStatusObserver {
public:
// Context of StartSession calls.
typedef enum {
@@ -245,6 +247,11 @@ class UserSessionManager
// Used when restoring user sessions after crash.
void OnProfilePrepared(Profile* profile, bool browser_launched) override;
+ // ChildAccountStatusObserver override:
+ void OnChildAccountStatusChanged() override;
+
+ void StopStatusObserving();
+
void CreateUserSession(const UserContext& user_context,
bool has_auth_cookies);
void PreStartSession();
@@ -413,6 +420,12 @@ class UserSessionManager
// Whether should launch browser, tests may override this value.
bool should_launch_browser_;
+ // Whether we have postponed request for InitializeStartUrls call.
+ bool init_start_urls_was_postponed_;
+ Profile* profile_fetching_flags_;
+
+ base::WeakPtrFactory<UserSessionManager> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
};

Powered by Google App Engine
This is Rietveld 408576698