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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 318853004: Introduce SessionManager that will contain code to start user session on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.h ('k') | chrome/browser/chromeos/login/login_utils_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index b369abb5d071373673a8eea8b0b2cf34be957ac6..f5946418504d2da79c93a9e5e30a60878f3974fc 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -21,7 +21,6 @@
#include "base/memory/weak_ptr.h"
#include "base/path_service.h"
#include "base/prefs/pref_member.h"
-#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -36,7 +35,6 @@
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/chromeos/input_method/input_method_util.h"
#include "chrome/browser/chromeos/login/auth/parallel_authenticator.h"
#include "chrome/browser/chromeos/login/auth/user_context.h"
#include "chrome/browser/chromeos/login/chrome_restart_request.h"
@@ -45,6 +43,7 @@
#include "chrome/browser/chromeos/login/profile_auth_data.h"
#include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
#include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h"
+#include "chrome/browser/chromeos/login/session/session_manager.h"
#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
#include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
@@ -76,7 +75,6 @@
#include "chromeos/dbus/dbus_method_call_status.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/session_manager_client.h"
-#include "chromeos/ime/input_method_manager.h"
#include "chromeos/settings/cros_settings_names.h"
#include "components/signin/core/browser/signin_manager.h"
#include "content/public/browser/browser_thread.h"
@@ -111,21 +109,14 @@ struct DoBrowserLaunchOnLocaleLoadedData;
class LoginUtilsImpl
: public LoginUtils,
- public OAuth2LoginManager::Observer,
- public net::NetworkChangeNotifier::ConnectionTypeObserver,
- public base::SupportsWeakPtr<LoginUtilsImpl> {
+ public base::SupportsWeakPtr<LoginUtilsImpl>,
+ public SessionManager::Delegate {
public:
LoginUtilsImpl()
- : has_web_auth_cookies_(false),
- delegate_(NULL),
- exit_after_session_restore_(false),
- session_restore_strategy_(
- OAuth2LoginManager::RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN) {
- net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+ : delegate_(NULL) {
}
virtual ~LoginUtilsImpl() {
- net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
}
// LoginUtils implementation:
@@ -133,33 +124,23 @@ class LoginUtilsImpl
LoginDisplayHost* login_host) OVERRIDE;
virtual void PrepareProfile(
const UserContext& user_context,
- const std::string& display_email,
bool has_cookies,
bool has_active_session,
LoginUtils::Delegate* delegate) OVERRIDE;
virtual void DelegateDeleted(LoginUtils::Delegate* delegate) OVERRIDE;
virtual void CompleteOffTheRecordLogin(const GURL& start_url) OVERRIDE;
- virtual void SetFirstLoginPrefs(PrefService* prefs) OVERRIDE;
virtual scoped_refptr<Authenticator> CreateAuthenticator(
LoginStatusConsumer* consumer) OVERRIDE;
- virtual void RestoreAuthenticationSession(Profile* profile) OVERRIDE;
- virtual void InitRlzDelayed(Profile* user_profile) OVERRIDE;
- // OAuth2LoginManager::Observer overrides.
- virtual void OnSessionRestoreStateChanged(
- Profile* user_profile,
- OAuth2LoginManager::SessionRestoreState state) OVERRIDE;
- virtual void OnNewRefreshTokenAvaiable(Profile* user_profile) OVERRIDE;
-
- // net::NetworkChangeNotifier::ConnectionTypeObserver overrides.
- virtual void OnConnectionTypeChanged(
- net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+ // SessionManager::Delegate implementation:
+ virtual void OnProfilePrepared(Profile* profile) OVERRIDE;
+ #if defined(ENABLE_RLZ)
+ virtual void OnRlzInitialized() OVERRIDE;
+ #endif
private:
- typedef std::set<std::string> SessionRestoreStateSet;
-
// DoBrowserLaunch is split into two parts.
- // This one is called after anynchronous locale switch.
+ // This one is called after asynchronous locale switch.
void DoBrowserLaunchOnLocaleLoadedImpl(Profile* profile,
LoginDisplayHost* login_host);
@@ -170,79 +151,16 @@ class LoginUtilsImpl
const std::string& loaded_locale,
const bool success);
- // Restarts OAuth session authentication check.
- void KickStartAuthentication(Profile* profile);
-
- // Callback for Profile::CREATE_STATUS_CREATED profile state.
- // Initializes basic preferences for newly created profile. Any other
- // early profile initialization that needs to happen before
- // ProfileManager::DoFinalInit() gets called is done here.
- void InitProfilePreferences(Profile* user_profile,
- const std::string& email);
-
- // Callback for asynchronous profile creation.
- void OnProfileCreated(const std::string& email,
- Profile* profile,
- Profile::CreateStatus status);
-
- // Callback for asynchronous off the record profile creation.
- void OnOTRProfileCreated(const std::string& email,
- Profile* profile,
- Profile::CreateStatus status);
-
- // Callback for Profile::CREATE_STATUS_INITIALIZED profile state.
- // Profile is created, extensions and promo resources are initialized.
- void UserProfileInitialized(Profile* user_profile);
-
- // Callback for Profile::CREATE_STATUS_INITIALIZED profile state for an OTR
- // login.
- void OTRProfileInitialized(Profile* user_profile);
-
- // Callback to resume profile creation after transferring auth data from
- // the authentication profile.
- void CompleteProfileCreate(Profile* user_profile);
-
- // Finalized profile preparation.
- void FinalizePrepareProfile(Profile* user_profile);
-
- // Initializes member variables needed for session restore process via
- // OAuthLoginManager.
- void InitSessionRestoreStrategy();
-
- // Restores GAIA auth cookies for the created user profile from OAuth2 token.
- void RestoreAuthSession(Profile* user_profile,
- bool restore_from_auth_cookies);
-
- // Initializes RLZ. If |disabled| is true, RLZ pings are disabled.
- void InitRlz(Profile* user_profile, bool disabled);
-
// Attempts restarting the browser process and esures that this does
// not happen while we are still fetching new OAuth refresh tokens.
void AttemptRestart(Profile* profile);
- UserContext user_context_;
-
- // True if the authentication profile's cookie jar should contain
- // authentication cookies from the authentication extension log in flow.
- bool has_web_auth_cookies_;
// Has to be scoped_refptr, see comment for CreateAuthenticator(...).
scoped_refptr<Authenticator> authenticator_;
// Delegate to be fired when the profile will be prepared.
LoginUtils::Delegate* delegate_;
- // Set of user_id for those users that we should restore authentication
- // session when notified about online state change.
- SessionRestoreStateSet pending_restore_sessions_;
-
- // True if we should restart chrome right after session restore.
- bool exit_after_session_restore_;
-
- // Sesion restore strategy.
- OAuth2LoginManager::SessionRestoreStrategy session_restore_strategy_;
- // OAuth2 refresh token for session restore.
- std::string oauth2_refresh_token_;
-
DISALLOW_COPY_AND_ASSIGN(LoginUtilsImpl);
};
@@ -385,57 +303,22 @@ void LoginUtilsImpl::DoBrowserLaunch(Profile* profile,
void LoginUtilsImpl::PrepareProfile(
const UserContext& user_context,
- const std::string& display_email,
bool has_cookies,
bool has_active_session,
LoginUtils::Delegate* delegate) {
- BootTimesLoader* btl = BootTimesLoader::Get();
-
- VLOG(1) << "Completing login for " << user_context.GetUserID();
-
- if (!has_active_session) {
- btl->AddLoginTimeMarker("StartSession-Start", false);
- DBusThreadManager::Get()->GetSessionManagerClient()->StartSession(
- user_context.GetUserID());
- btl->AddLoginTimeMarker("StartSession-End", false);
- }
-
- btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
- UserManager* user_manager = UserManager::Get();
- user_manager->UserLoggedIn(user_context.GetUserID(),
- user_context.GetUserIDHash(),
- false);
- btl->AddLoginTimeMarker("UserLoggedIn-End", false);
-
- // Switch log file as soon as possible.
- if (base::SysInfo::IsRunningOnChromeOS())
- logging::RedirectChromeLogging(*(CommandLine::ForCurrentProcess()));
-
- // Update user's displayed email.
- if (!display_email.empty())
- user_manager->SaveUserDisplayEmail(user_context.GetUserID(), display_email);
-
- user_context_ = user_context;
-
- has_web_auth_cookies_ = has_cookies;
+ // TODO(nkostylev): We have to initialize LoginUtils delegate as long
+ // as it coexist with SessionManager.
delegate_ = delegate;
- InitSessionRestoreStrategy();
-
- if (DemoAppLauncher::IsDemoAppSession(user_context.GetUserID())) {
- g_browser_process->profile_manager()->CreateProfileAsync(
- user_manager->GetUserProfileDir(user_context.GetUserID()),
- base::Bind(&LoginUtilsImpl::OnOTRProfileCreated, AsWeakPtr(),
- user_context.GetUserID()),
- base::string16(), base::string16(), std::string());
- } else {
- // Can't use display_email because it is empty when existing user logs in
- // using sing-in pod on login screen (i.e. user didn't type email).
- g_browser_process->profile_manager()->CreateProfileAsync(
- user_manager->GetUserProfileDir(user_context.GetUserID()),
- base::Bind(&LoginUtilsImpl::OnProfileCreated, AsWeakPtr(),
- user_context.GetUserID()),
- base::string16(), base::string16(), std::string());
- }
+
+ // For the transition part LoginUtils will just delegate profile
+ // creation and initialization to SessionManager. Later LoginUtils will be
+ // removed and all LoginUtils clients will just work with SessionManager
+ // directly.
+ SessionManager::GetInstance()->StartSession(user_context,
+ authenticator_,
+ has_cookies,
+ has_active_session,
+ this);
}
void LoginUtilsImpl::DelegateDeleted(LoginUtils::Delegate* delegate) {
@@ -443,273 +326,6 @@ void LoginUtilsImpl::DelegateDeleted(LoginUtils::Delegate* delegate) {
delegate_ = NULL;
}
-void LoginUtilsImpl::InitProfilePreferences(Profile* user_profile,
- const std::string& user_id) {
- if (UserManager::Get()->IsCurrentUserNew())
- SetFirstLoginPrefs(user_profile->GetPrefs());
-
- if (UserManager::Get()->IsLoggedInAsLocallyManagedUser()) {
- User* active_user = UserManager::Get()->GetActiveUser();
- std::string managed_user_sync_id =
- UserManager::Get()->GetSupervisedUserManager()->
- GetUserSyncId(active_user->email());
-
- // TODO(ibraaaa): Remove that when 97% of our users are using M31.
- // http://crbug.com/276163
- if (managed_user_sync_id.empty())
- managed_user_sync_id = "DUMMY_ID";
-
- user_profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
- managed_user_sync_id);
- } else if (UserManager::Get()->IsLoggedInAsRegularUser()) {
- // Make sure that the google service username is properly set (we do this
- // on every sign in, not just the first login, to deal with existing
- // profiles that might not have it set yet).
- SigninManagerBase* signin_manager =
- SigninManagerFactory::GetForProfile(user_profile);
- signin_manager->SetAuthenticatedUsername(user_id);
- }
-}
-
-void LoginUtilsImpl::InitSessionRestoreStrategy() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- bool in_app_mode = chrome::IsRunningInForcedAppMode();
-
- // Are we in kiosk app mode?
- if (in_app_mode) {
- if (command_line->HasSwitch(::switches::kAppModeOAuth2Token)) {
- oauth2_refresh_token_ = command_line->GetSwitchValueASCII(
- ::switches::kAppModeOAuth2Token);
- }
-
- if (command_line->HasSwitch(::switches::kAppModeAuthCode)) {
- user_context_.SetAuthCode(command_line->GetSwitchValueASCII(
- ::switches::kAppModeAuthCode));
- }
-
- DCHECK(!has_web_auth_cookies_);
- if (!user_context_.GetAuthCode().empty()) {
- session_restore_strategy_ = OAuth2LoginManager::RESTORE_FROM_AUTH_CODE;
- } else if (!oauth2_refresh_token_.empty()) {
- session_restore_strategy_ =
- OAuth2LoginManager::RESTORE_FROM_PASSED_OAUTH2_REFRESH_TOKEN;
- } else {
- session_restore_strategy_ =
- OAuth2LoginManager::RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN;
- }
- return;
- }
-
- if (has_web_auth_cookies_) {
- session_restore_strategy_ = OAuth2LoginManager::RESTORE_FROM_COOKIE_JAR;
- } else if (!user_context_.GetAuthCode().empty()) {
- session_restore_strategy_ = OAuth2LoginManager::RESTORE_FROM_AUTH_CODE;
- } else {
- session_restore_strategy_ =
- OAuth2LoginManager::RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN;
- }
-}
-
-
-void LoginUtilsImpl::OnProfileCreated(
- const std::string& user_id,
- Profile* user_profile,
- Profile::CreateStatus status) {
- CHECK(user_profile);
-
- switch (status) {
- case Profile::CREATE_STATUS_CREATED:
- InitProfilePreferences(user_profile, user_id);
- break;
- case Profile::CREATE_STATUS_INITIALIZED:
- UserProfileInitialized(user_profile);
- break;
- case Profile::CREATE_STATUS_LOCAL_FAIL:
- case Profile::CREATE_STATUS_REMOTE_FAIL:
- case Profile::CREATE_STATUS_CANCELED:
- case Profile::MAX_CREATE_STATUS:
- NOTREACHED();
- break;
- }
-}
-
-void LoginUtilsImpl::OnOTRProfileCreated(
- const std::string& user_id,
- Profile* user_profile,
- Profile::CreateStatus status) {
- CHECK(user_profile);
-
- switch (status) {
- case Profile::CREATE_STATUS_CREATED:
- InitProfilePreferences(user_profile, user_id);
- break;
- case Profile::CREATE_STATUS_INITIALIZED:
- OTRProfileInitialized(user_profile);
- break;
- case Profile::CREATE_STATUS_LOCAL_FAIL:
- case Profile::CREATE_STATUS_REMOTE_FAIL:
- case Profile::CREATE_STATUS_CANCELED:
- case Profile::MAX_CREATE_STATUS:
- NOTREACHED();
- break;
- }
-}
-
-void LoginUtilsImpl::UserProfileInitialized(Profile* user_profile) {
- BootTimesLoader* btl = BootTimesLoader::Get();
- btl->AddLoginTimeMarker("UserProfileGotten", false);
-
- if (user_context_.IsUsingOAuth()) {
- // Transfer proxy authentication cache, cookies (optionally) and server
- // bound certs from the profile that was used for authentication. This
- // profile contains cookies that auth extension should have already put in
- // place that will ensure that the newly created session is authenticated
- // for the websites that work with the used authentication schema.
- ProfileAuthData::Transfer(authenticator_->authentication_profile(),
- user_profile,
- has_web_auth_cookies_, // transfer_cookies
- base::Bind(
- &LoginUtilsImpl::CompleteProfileCreate,
- AsWeakPtr(),
- user_profile));
- return;
- }
-
- FinalizePrepareProfile(user_profile);
-}
-
-void LoginUtilsImpl::OTRProfileInitialized(Profile* user_profile) {
- user_profile->OnLogin();
- // Send the notification before creating the browser so additional objects
- // that need the profile (e.g. the launcher) can be created first.
- content::NotificationService::current()->Notify(
- chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
- content::NotificationService::AllSources(),
- content::Details<Profile>(user_profile));
-
- if (delegate_)
- delegate_->OnProfilePrepared(user_profile);
-}
-
-void LoginUtilsImpl::CompleteProfileCreate(Profile* user_profile) {
- RestoreAuthSession(user_profile, has_web_auth_cookies_);
- FinalizePrepareProfile(user_profile);
-}
-
-void LoginUtilsImpl::RestoreAuthSession(Profile* user_profile,
- bool restore_from_auth_cookies) {
- CHECK((authenticator_.get() && authenticator_->authentication_profile()) ||
- !restore_from_auth_cookies);
-
- if (chrome::IsRunningInForcedAppMode() ||
- CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kOobeSkipPostLogin)) {
- return;
- }
-
- exit_after_session_restore_ = false;
- // Remove legacy OAuth1 token if we have one. If it's valid, we should already
- // have OAuth2 refresh token in OAuth2TokenService that could be used to
- // retrieve all other tokens and user_context.
- OAuth2LoginManager* login_manager =
- OAuth2LoginManagerFactory::GetInstance()->GetForProfile(user_profile);
- login_manager->AddObserver(this);
- login_manager->RestoreSession(
- authenticator_.get() && authenticator_->authentication_profile()
- ? authenticator_->authentication_profile()->GetRequestContext()
- : NULL,
- session_restore_strategy_,
- oauth2_refresh_token_,
- user_context_.GetAuthCode());
-}
-
-void LoginUtilsImpl::FinalizePrepareProfile(Profile* user_profile) {
- BootTimesLoader* btl = BootTimesLoader::Get();
- // Own TPM device if, for any reason, it has not been done in EULA
- // wizard screen.
- CryptohomeClient* client = DBusThreadManager::Get()->GetCryptohomeClient();
- btl->AddLoginTimeMarker("TPMOwn-Start", false);
- if (cryptohome_util::TpmIsEnabled() && !cryptohome_util::TpmIsBeingOwned()) {
- if (cryptohome_util::TpmIsOwned()) {
- client->CallTpmClearStoredPasswordAndBlock();
- } else {
- client->TpmCanAttemptOwnership(EmptyVoidDBusMethodCallback());
- }
- }
- btl->AddLoginTimeMarker("TPMOwn-End", false);
-
- if (UserManager::Get()->IsLoggedInAsRegularUser()) {
- SAMLOfflineSigninLimiter* saml_offline_signin_limiter =
- SAMLOfflineSigninLimiterFactory::GetForProfile(user_profile);
- if (saml_offline_signin_limiter)
- saml_offline_signin_limiter->SignedIn(user_context_.GetAuthFlow());
- }
-
- user_profile->OnLogin();
-
- // Send the notification before creating the browser so additional objects
- // that need the profile (e.g. the launcher) can be created first.
- content::NotificationService::current()->Notify(
- chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
- content::NotificationService::AllSources(),
- content::Details<Profile>(user_profile));
-
- // Initialize RLZ only for primary user.
- if (UserManager::Get()->GetPrimaryUser() ==
- UserManager::Get()->GetUserByProfile(user_profile)) {
- InitRlzDelayed(user_profile);
- }
- // TODO(altimofeev): This pointer should probably never be NULL, but it looks
- // like LoginUtilsImpl::OnProfileCreated() may be getting called before
- // LoginUtilsImpl::PrepareProfile() has set |delegate_| when Chrome is killed
- // during shutdown in tests -- see http://crosbug.com/18269. Replace this
- // 'if' statement with a CHECK(delegate_) once the underlying issue is
- // resolved.
- if (delegate_)
- delegate_->OnProfilePrepared(user_profile);
-}
-
-void LoginUtilsImpl::InitRlzDelayed(Profile* user_profile) {
-#if defined(ENABLE_RLZ)
- if (!g_browser_process->local_state()->HasPrefPath(prefs::kRLZBrand)) {
- // Read brand code asynchronously from an OEM data and repost ourselves.
- google_brand::chromeos::InitBrand(
- base::Bind(&LoginUtilsImpl::InitRlzDelayed, AsWeakPtr(), user_profile));
- return;
- }
- base::PostTaskAndReplyWithResult(
- base::WorkerPool::GetTaskRunner(false),
- FROM_HERE,
- base::Bind(&base::PathExists, GetRlzDisabledFlagPath()),
- base::Bind(&LoginUtilsImpl::InitRlz, AsWeakPtr(), user_profile));
-#endif
-}
-
-void LoginUtilsImpl::InitRlz(Profile* user_profile, bool disabled) {
-#if defined(ENABLE_RLZ)
- PrefService* local_state = g_browser_process->local_state();
- if (disabled) {
- // Empty brand code means an organic install (no RLZ pings are sent).
- google_brand::chromeos::ClearBrandForCurrentSession();
- }
- if (disabled != local_state->GetBoolean(prefs::kRLZDisabled)) {
- // When switching to RLZ enabled/disabled state, clear all recorded events.
- RLZTracker::ClearRlzState();
- local_state->SetBoolean(prefs::kRLZDisabled, disabled);
- }
- // Init the RLZ library.
- int ping_delay = user_profile->GetPrefs()->GetInteger(
- first_run::GetPingDelayPrefName().c_str());
- // Negative ping delay means to send ping immediately after a first search is
- // recorded.
- RLZTracker::InitRlzFromProfileDelayed(
- user_profile, UserManager::Get()->IsCurrentUserNew(),
- ping_delay < 0, base::TimeDelta::FromMilliseconds(abs(ping_delay)));
- if (delegate_)
- delegate_->OnRlzInitialized(user_profile);
-#endif
-}
-
void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) {
VLOG(1) << "Completing incognito login";
@@ -726,52 +342,6 @@ void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) {
RestartChrome(cmd_line_str);
}
-void LoginUtilsImpl::SetFirstLoginPrefs(PrefService* prefs) {
- VLOG(1) << "Setting first login prefs";
- BootTimesLoader* btl = BootTimesLoader::Get();
- std::string locale = g_browser_process->GetApplicationLocale();
-
- // First, we'll set kLanguagePreloadEngines.
- input_method::InputMethodManager* manager =
- input_method::InputMethodManager::Get();
- std::vector<std::string> input_method_ids;
- manager->GetInputMethodUtil()->GetFirstLoginInputMethodIds(
- locale, manager->GetCurrentInputMethod(), &input_method_ids);
- // Save the input methods in the user's preferences.
- StringPrefMember language_preload_engines;
- language_preload_engines.Init(prefs::kLanguagePreloadEngines,
- prefs);
- language_preload_engines.SetValue(JoinString(input_method_ids, ','));
- btl->AddLoginTimeMarker("IMEStarted", false);
-
- // Second, we'll set kLanguagePreferredLanguages.
- std::vector<std::string> language_codes;
- // The current locale should be on the top.
- language_codes.push_back(locale);
-
- // Add input method IDs based on the input methods, as there may be
- // input methods that are unrelated to the current locale. Example: the
- // hardware keyboard layout xkb:us::eng is used for logging in, but the
- // UI language is set to French. In this case, we should set "fr,en"
- // to the preferred languages preference.
- std::vector<std::string> candidates;
- manager->GetInputMethodUtil()->GetLanguageCodesFromInputMethodIds(
- input_method_ids, &candidates);
- for (size_t i = 0; i < candidates.size(); ++i) {
- const std::string& candidate = candidates[i];
- // Skip if it's already in language_codes.
- if (std::count(language_codes.begin(), language_codes.end(),
- candidate) == 0) {
- language_codes.push_back(candidate);
- }
- }
- // Save the preferred languages in the user's preferences.
- StringPrefMember language_preferred_languages;
- language_preferred_languages.Init(prefs::kLanguagePreferredLanguages,
- prefs);
- language_preferred_languages.SetValue(JoinString(language_codes, ','));
-}
-
scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator(
LoginStatusConsumer* consumer) {
// Screen locker needs new Authenticator instance each time.
@@ -790,118 +360,20 @@ scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator(
return authenticator_;
}
-void LoginUtilsImpl::RestoreAuthenticationSession(Profile* user_profile) {
- UserManager* user_manager = UserManager::Get();
- // We don't need to restore session for demo/guest/stub/public account users.
- if (!user_manager->IsUserLoggedIn() ||
- user_manager->IsLoggedInAsGuest() ||
- user_manager->IsLoggedInAsPublicAccount() ||
- user_manager->IsLoggedInAsDemoUser() ||
- user_manager->IsLoggedInAsStub()) {
- return;
- }
-
- User* user = user_manager->GetUserByProfile(user_profile);
- DCHECK(user);
- if (!net::NetworkChangeNotifier::IsOffline()) {
- pending_restore_sessions_.erase(user->email());
- RestoreAuthSession(user_profile, false);
- } else {
- // Even if we're online we should wait till initial
- // OnConnectionTypeChanged() call. Otherwise starting fetchers too early may
- // end up canceling all request when initial network connection type is
- // processed. See http://crbug.com/121643.
- pending_restore_sessions_.insert(user->email());
- }
-}
-
-void LoginUtilsImpl::OnSessionRestoreStateChanged(
- Profile* user_profile,
- OAuth2LoginManager::SessionRestoreState state) {
- User::OAuthTokenStatus user_status = User::OAUTH_TOKEN_STATUS_UNKNOWN;
- OAuth2LoginManager* login_manager =
- OAuth2LoginManagerFactory::GetInstance()->GetForProfile(user_profile);
-
- bool connection_error = false;
- switch (state) {
- case OAuth2LoginManager::SESSION_RESTORE_DONE:
- user_status = User::OAUTH2_TOKEN_STATUS_VALID;
- break;
- case OAuth2LoginManager::SESSION_RESTORE_FAILED:
- user_status = User::OAUTH2_TOKEN_STATUS_INVALID;
- break;
- case OAuth2LoginManager::SESSION_RESTORE_CONNECTION_FAILED:
- connection_error = true;
- break;
- case OAuth2LoginManager::SESSION_RESTORE_NOT_STARTED:
- case OAuth2LoginManager::SESSION_RESTORE_PREPARING:
- case OAuth2LoginManager::SESSION_RESTORE_IN_PROGRESS:
- return;
- }
-
- // We should not be clearing existing token state if that was a connection
- // error. http://crbug.com/295245
- if (!connection_error) {
- // We are in one of "done" states here.
- UserManager::Get()->SaveUserOAuthStatus(
- UserManager::Get()->GetLoggedInUser()->email(),
- user_status);
- }
-
- login_manager->RemoveObserver(this);
-}
-
-void LoginUtilsImpl::OnNewRefreshTokenAvaiable(Profile* user_profile) {
- // Check if we were waiting to restart chrome.
- if (!exit_after_session_restore_)
- return;
-
- OAuth2LoginManager* login_manager =
- OAuth2LoginManagerFactory::GetInstance()->GetForProfile(user_profile);
- login_manager->RemoveObserver(this);
-
- // Mark user auth token status as valid.
- UserManager::Get()->SaveUserOAuthStatus(
- UserManager::Get()->GetLoggedInUser()->email(),
- User::OAUTH2_TOKEN_STATUS_VALID);
-
- LOG(WARNING) << "Exiting after new refresh token fetched";
- // We need to restart cleanly in this case to make sure OAuth2 RT is actually
- // saved.
- chrome::AttemptRestart();
+void LoginUtilsImpl::OnProfilePrepared(Profile* profile) {
+ if (delegate_)
+ delegate_->OnProfilePrepared(profile);
}
-void LoginUtilsImpl::OnConnectionTypeChanged(
- net::NetworkChangeNotifier::ConnectionType type) {
- UserManager* user_manager = UserManager::Get();
- if (type == net::NetworkChangeNotifier::CONNECTION_NONE ||
- user_manager->IsLoggedInAsGuest() || !user_manager->IsUserLoggedIn()) {
- return;
- }
-
- // Need to iterate over all users and their OAuth2 session state.
- const UserList& users = user_manager->GetLoggedInUsers();
- for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
- Profile* user_profile = user_manager->GetProfileByUser(*it);
- bool should_restore_session =
- pending_restore_sessions_.find((*it)->email()) !=
- pending_restore_sessions_.end();
- OAuth2LoginManager* login_manager =
- OAuth2LoginManagerFactory::GetInstance()->GetForProfile(user_profile);
- if (login_manager->state() ==
- OAuth2LoginManager::SESSION_RESTORE_IN_PROGRESS) {
- // If we come online for the first time after successful offline login,
- // we need to kick off OAuth token verification process again.
- login_manager->ContinueSessionRestore();
- } else if (should_restore_session) {
- pending_restore_sessions_.erase((*it)->email());
- RestoreAuthSession(user_profile, has_web_auth_cookies_);
- }
- }
+#if defined(ENABLE_RLZ)
+void LoginUtilsImpl::OnRlzInitialized() {
+ if (delegate_)
+ delegate_->OnRlzInitialized();
}
+#endif
void LoginUtilsImpl::AttemptRestart(Profile* profile) {
- if (session_restore_strategy_ !=
+ if (SessionManager::GetInstance()->GetSigninSessionRestoreStrategy() !=
OAuth2LoginManager::RESTORE_FROM_COOKIE_JAR) {
chrome::AttemptRestart();
return;
@@ -920,15 +392,7 @@ void LoginUtilsImpl::AttemptRestart(Profile* profile) {
}
LOG(WARNING) << "Attempting browser restart during session restore.";
- exit_after_session_restore_ = true;
-}
-
-// static
-void LoginUtils::RegisterPrefs(PrefRegistrySimple* registry) {
- registry->RegisterBooleanPref(prefs::kFactoryResetRequested, false);
- registry->RegisterBooleanPref(prefs::kRollbackRequested, false);
- registry->RegisterStringPref(prefs::kRLZBrand, std::string());
- registry->RegisterBooleanPref(prefs::kRLZDisabled, false);
+ SessionManager::GetInstance()->set_exit_after_session_restore(true);
}
// static
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.h ('k') | chrome/browser/chromeos/login/login_utils_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698