Index: chrome/browser/chromeos/arc/arc_auth_service.cc |
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.cc b/chrome/browser/chromeos/arc/arc_auth_service.cc |
index 0c12cb97c2f2c5d033fcf5c624760fb23445bf31..c6a31462bab58b2285f250a83a5e07baf5797101 100644 |
--- a/chrome/browser/chromeos/arc/arc_auth_service.cc |
+++ b/chrome/browser/chromeos/arc/arc_auth_service.cc |
@@ -194,24 +194,17 @@ void ArcAuthService::OnPrimaryUserProfilePrepared(Profile* profile) { |
profile_, GURL(site_url)); |
CHECK(storage_partition_); |
- // In case UI is disabled we assume that ARC is opted-in. |
- if (!IsOptInVerificationDisabled()) { |
- pref_change_registrar_.Init(profile_->GetPrefs()); |
- pref_change_registrar_.Add( |
- prefs::kArcEnabled, |
- base::Bind(&ArcAuthService::OnOptInPreferenceChanged, |
- base::Unretained(this))); |
- if (profile_->GetPrefs()->GetBoolean(prefs::kArcEnabled)) { |
- OnOptInPreferenceChanged(); |
- } else { |
- if (!disable_ui_for_testing && profile_->IsNewProfile()) { |
- PrefServiceSyncableFromProfile(profile_)->AddObserver(this); |
- OnIsSyncingChanged(); |
- } |
- } |
+ pref_change_registrar_.Init(profile_->GetPrefs()); |
+ pref_change_registrar_.Add( |
+ prefs::kArcEnabled, base::Bind(&ArcAuthService::OnOptInPreferenceChanged, |
+ base::Unretained(this))); |
+ if (profile_->GetPrefs()->GetBoolean(prefs::kArcEnabled)) { |
+ OnOptInPreferenceChanged(); |
} else { |
- auth_code_.clear(); |
- StartArc(); |
+ if (!disable_ui_for_testing && profile_->IsNewProfile()) { |
+ PrefServiceSyncableFromProfile(profile_)->AddObserver(this); |
+ OnIsSyncingChanged(); |
+ } |
} |
} |
@@ -291,16 +284,20 @@ void ArcAuthService::OnOptInPreferenceChanged() { |
if (profile_->GetPrefs()->GetBoolean(prefs::kArcEnabled)) { |
if (state_ != State::ACTIVE) { |
- CloseUI(); |
auth_code_.clear(); |
- if (!profile_->GetPrefs()->GetBoolean(prefs::kArcSignedIn)) { |
- // Need pre-fetch auth code and show OptIn UI if needed. |
- initial_opt_in_ = true; |
- SetState(State::FETCHING_CODE); |
- FetchAuthCode(); |
+ if (!IsOptInVerificationDisabled()) { |
+ CloseUI(); |
+ if (!profile_->GetPrefs()->GetBoolean(prefs::kArcSignedIn)) { |
+ // Need pre-fetch auth code and show OptIn UI if needed. |
+ initial_opt_in_ = true; |
+ SetState(State::FETCHING_CODE); |
+ FetchAuthCode(); |
+ } else { |
+ // Ready to start Arc. |
+ StartArc(); |
+ } |
} else { |
- // Ready to start Arc. |
StartArc(); |
} |
} |