Removing FRE UI for unicorn accounts.

chrome/browser/chromeos/login/session/user_session_manager.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #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"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 
 class GURL;
 class PrefRegistrySimple;
@@ skipping 40 matching lines @@
 // * mark user as logged in and notify observers,
 // * initialize OAuth2 authentication session,
 // * initialize and launch user session based on the user type.
 // Also supports restoring active user sessions after browser crash:
 // load profile, restore OAuth authentication session etc.
 class UserSessionManager
     : public OAuth2LoginManager::Observer,
       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 {
     // Starting primary user session, through login UI.
     PRIMARY_USER_SESSION,
 
     // Starting secondary user session, through multi-profiles login UI.
     SECONDARY_USER_SESSION,
 
     // Starting primary user session after browser crash.
@@ skipping 136 matching lines @@
 
  private:
   friend class test::UserSessionManagerTestApi;
   friend struct DefaultSingletonTraits<UserSessionManager>;
 
   typedef std::set<std::string> SigninSessionRestoreStateSet;
 
   UserSessionManager();
   ~UserSessionManager() override;
 
+  // Milliseconds until we timeout our attempt to fetch flags from Child Account
+  // Service.
+  static const int kFlagsFetchingLoginTimeoutMs;

[Marc Treib, 2015/03/04 16:31:48]

I think there's no reason for this to be in the header, right? I'd just make it
a local constant in the .cc

[merkulova, 2015/03/04 19:06:49]

Done.

+
   // OAuth2LoginManager::Observer overrides:
   void OnSessionRestoreStateChanged(
       Profile* user_profile,
       OAuth2LoginManager::SessionRestoreState state) override;
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver overrides:
   void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) override;
 
   // UserSessionManagerDelegate overrides:
   // Used when restoring user sessions after crash.
   void OnProfilePrepared(Profile* profile, bool browser_launched) override;
 
+  // ChildAccountStatusObserver override:
+  void OnChildAccountStatusChanged() override;
+
+  void OnStatusObservingCancelled();
+
+  void StopStatusObserving();
+
   void CreateUserSession(const UserContext& user_context,
                          bool has_auth_cookies);
   void PreStartSession();
   void StartCrosSession();
   void NotifyUserLoggedIn();
   void PrepareProfile();
 
   // Callback for asynchronous profile creation.
   void OnProfileCreated(const UserContext& user_context,
                         bool is_incognito_profile,
@@ skipping 148 matching lines @@
       ProfileCompare> default_ime_states_;
 
   // Manages Easy unlock cryptohome keys.
   scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_;
   bool running_easy_unlock_key_ops_;
   base::Closure easy_unlock_key_ops_finished_callback_;
 
   // Whether should launch browser, tests may override this value.
   bool should_launch_browser_;
 
+  // Whether we have postponed request for InitializeStartUrls call.
+  bool requesting_start_urls_;

[Marc Treib, 2015/03/04 16:31:48]

This name sounds like "we're currently requesting the start URLs". Maybe
"init_start_urls_was_postponed_"?

[merkulova, 2015/03/04 19:06:49]

Done.

+  Profile* profile_fetching_flags_;
+
+  base::WeakPtrFactory<UserSessionManager> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_