| Index: chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc
|
| diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc
|
| index 380d1d6ec07abf9b8f873371ed77aa60f8147122..bbc928ad0c46165430bcc78815e176a4092a738d 100644
|
| --- a/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc
|
| +++ b/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc
|
| @@ -71,13 +71,16 @@ void LocallyManagedUserLoginFlow::HandleOAuthTokenStatusChange(
|
| void LocallyManagedUserLoginFlow::OnSyncSetupDataLoaded(
|
| const std::string& token) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - // TODO(antrim): add error handling (no token loaded).
|
| ConfigureSync(token);
|
| }
|
|
|
| void LocallyManagedUserLoginFlow::ConfigureSync(const std::string& token) {
|
| data_loaded_ = true;
|
| - ManagedUserServiceFactory::GetForProfile(profile_)->InitSync(token);
|
| + // TODO(antrim): add error handling (no token loaded).
|
| + // See also: http://crbug.com/312751
|
| + if (!token.empty())
|
| + ManagedUserServiceFactory::GetForProfile(profile_)->InitSync(token);
|
| +
|
| LoginUtils::Get()->DoBrowserLaunch(profile_, host());
|
| profile_ = NULL;
|
| UnregisterFlowSoon();
|
|
|