Removing FRE UI for unicorn accounts.

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

 // 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.
 
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 47 matching lines @@
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/net/nss_context.h"
 #include "chrome/browser/pref_service_flags_storage.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
+#include "chrome/browser/supervised_user/child_accounts/child_account_service_factory.h"
 #include "chrome/browser/ui/app_list/start_page_service.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/cert_loader.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/cryptohome_util.h"
 #include "chromeos/dbus/cryptohome_client.h"
@@ skipping 15 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "url/gurl.h"
 
 namespace chromeos {
 
 namespace {
 
+// Milliseconds until we timeout our attempt to fetch flags from Child Account

[Bernhard Bauer, 2015/03/10 09:55:12]

Nit: Child Account Service is not a common name, so it's in lowercase. Also, if
you put an definite article in front it reads easier.

[merkulova, 2015/03/10 11:53:57]

Done.

+// Service.
+static const int kFlagsFetchingLoginTimeoutMs = 1000;
+
 // ChromeVox tutorial URL (used in place of "getting started" url when
 // accessibility is enabled).
 const char kChromeVoxTutorialURLPattern[] =
     "http://www.chromevox.com/tutorial/index.html?lang=%s";
 
 void InitLocaleAndInputMethodsForNewUser(
     UserSessionManager* session_manager,
     Profile* profile,
     const std::string& public_session_locale,
     const std::string& public_session_input_method) {
@@ skipping 193 matching lines @@
                                              true /* path is absolute */,
                                              false /* don't create */);
     }
   }
 }
 
 // static
 void UserSessionManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kRLZBrand, std::string());
   registry->RegisterBooleanPref(prefs::kRLZDisabled, false);
+  registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false);

[Bernhard Bauer, 2015/03/10 09:55:12]

So who registers this pref? UserSessionManager or ChildAccountService?

[merkulova, 2015/03/10 11:53:57]

ChildAccountService.

 }
 
 UserSessionManager::UserSessionManager()
     : delegate_(nullptr),
       authenticator_(nullptr),
       has_auth_cookies_(false),
       user_sessions_restored_(false),
       user_sessions_restore_in_progress_(false),
       exit_after_session_restore_(false),
       session_restore_strategy_(
           OAuth2LoginManager::RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN),
       running_easy_unlock_key_ops_(false),
-      should_launch_browser_(true) {
+      should_launch_browser_(true),
+      init_start_urls_was_postponed_(false),
+      profile_fetching_flags_(nullptr),
+      weak_factory_(this) {
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   user_manager::UserManager::Get()->AddSessionStateObserver(this);
 }
 
 UserSessionManager::~UserSessionManager() {
   // UserManager is destroyed before singletons, so we need to check if it
   // still exists.
   // TODO(nkostylev): fix order of destruction of UserManager
   // / UserSessionManager objects.
   if (user_manager::UserManager::IsInitialized())
@@ skipping 433 matching lines @@
     // users once it is fully multi-profile aware. http://crbug.com/238987
     // For now if we have other user pending sessions they'll override OAuth
     // session restore for previous users.
     RestoreAuthenticationSession(profile);
   }
 
   // Restore other user sessions if any.
   RestorePendingUserSessions();
 }
 
+void UserSessionManager::OnChildAccountStatusChanged(bool is_child) {
+  StopStatusObserving();
+}
+
+void UserSessionManager::StopStatusObserving() {
+  if (!profile_fetching_flags_)
+    return;
+  ChildAccountServiceFactory::GetForProfile(profile_fetching_flags_)->
+      RemoveStatusObserver(this);
+  profile_fetching_flags_ = nullptr;
+
+  if (init_start_urls_was_postponed_) {
+    InitializeStartUrls();
+    init_start_urls_was_postponed_ = false;
+  }
+}
+
 void UserSessionManager::CreateUserSession(const UserContext& user_context,
                                            bool has_auth_cookies) {
   user_context_ = user_context;
   has_auth_cookies_ = has_auth_cookies;
   InitSessionRestoreStrategy();
 }
 
 void UserSessionManager::PreStartSession() {
   // Switch log file as soon as possible.
   if (base::SysInfo::IsRunningOnChromeOS())
@@ skipping 246 matching lines @@
 void UserSessionManager::ActivateWizard(const std::string& screen_name) {
   LoginDisplayHost* host = LoginDisplayHostImpl::default_host();
   CHECK(host);
   host->StartWizard(screen_name);
 }
 
 void UserSessionManager::InitializeStartUrls() const {
   std::vector<std::string> start_urls;
 
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
+
   bool can_show_getstarted_guide =
       user_manager->GetActiveUser()->GetType() ==
           user_manager::USER_TYPE_REGULAR &&
       !user_manager->IsCurrentUserNonCryptohomeDataEphemeral();
+
   // Skip the default first-run behavior for public accounts.
   if (!user_manager->IsLoggedInAsPublicAccount()) {
     if (AccessibilityManager::Get()->IsSpokenFeedbackEnabled()) {
       const char* url = kChromeVoxTutorialURLPattern;
       PrefService* prefs = g_browser_process->local_state();
       const std::string current_locale =
           base::StringToLowerASCII(prefs->GetString(prefs::kApplicationLocale));
       std::string vox_url = base::StringPrintf(url, current_locale.c_str());
       start_urls.push_back(vox_url);
       can_show_getstarted_guide = false;
@@ skipping 11 matching lines @@
         ::switches::kSilentLaunch);
     first_run::MaybeLaunchDialogAfterSessionStart();
   } else {
     for (size_t i = 0; i < start_urls.size(); ++i) {
       base::CommandLine::ForCurrentProcess()->AppendArg(start_urls[i]);
     }
   }
 }
 
 bool UserSessionManager::InitializeUserSession(Profile* profile) {
+  ChildAccountService* child_service =
+      ChildAccountServiceFactory::GetForProfile(profile);
+  child_service->AddStatusObserver(this);
+  base::MessageLoopProxy::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&UserSessionManager::StopStatusObserving,
+                 weak_factory_.GetWeakPtr()),
+      base::TimeDelta::FromMilliseconds(kFlagsFetchingLoginTimeoutMs));
+  profile_fetching_flags_ = profile;
+
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
   // Kiosk apps has their own session initialization pipeline.
   if (user_manager->IsLoggedInAsKioskApp())
     return false;
 
   if (start_session_type_ == PRIMARY_USER_SESSION) {
     UserFlow* user_flow = ChromeUserManager::Get()->GetCurrentUserFlow();
     WizardController* oobe_controller = WizardController::default_controller();
     base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
     bool skip_post_login_screens =
         user_flow->ShouldSkipPostLoginScreens() ||
         (oobe_controller && oobe_controller->skip_post_login_screens()) ||
         cmdline->HasSwitch(chromeos::switches::kOobeSkipPostLogin);
 
     if (user_manager->IsCurrentUserNew() && !skip_post_login_screens) {
       // Don't specify start URLs if the administrator has configured the start
       // URLs via policy.
-      if (!SessionStartupPref::TypeIsManaged(profile->GetPrefs()))
-        InitializeStartUrls();
+      if (!SessionStartupPref::TypeIsManaged(profile->GetPrefs())) {
+        if (child_service->IsChildAccountStatusKnown())
+          InitializeStartUrls();
+        else
+          init_start_urls_was_postponed_ = true;
+      }
 
       // Mark the device as registered., i.e. the second part of OOBE as
       // completed.
       if (!StartupUtils::IsDeviceRegistered())
         StartupUtils::MarkDeviceRegistered(base::Closure());
 
       ActivateWizard(WizardController::kTermsOfServiceScreenName);
       return false;
     }
   }
@@ skipping 422 matching lines @@
   default_ime_states_.erase(profile);
 }
 
 void UserSessionManager::InjectStubUserContext(
     const UserContext& user_context) {
   injected_user_context_.reset(new UserContext(user_context));
   authenticator_ = NULL;
 }
 
 }  // namespace chromeos