summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/sync/profile_sync_service.cc2
-rw-r--r--chrome/browser/sync/profile_sync_service.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 47b1438..e655e5f 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -87,6 +87,7 @@ void ProfileSyncService::Initialize() {
// profile,) then bootstrap it.
StartUp();
profile()->GetPrefs()->SetBoolean(prefs::kSyncBootstrappedAuth, true);
+ FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
}
} else {
StartUp();
@@ -584,6 +585,7 @@ void ProfileSyncService::Observe(NotificationType type,
const NotificationDetails& details) {
switch (type.value) {
case NotificationType::SYNC_CONFIGURE_START: {
+ FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
// TODO(sync): Maybe toast?
break;
}
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 07c62ef..341614a 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -173,7 +173,8 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// occurred preventing the action. We make it the duty of ProfileSyncService
// to open the dialog to easily ensure only one is ever showing.
bool SetupInProgress() const {
- return !HasSyncSetupCompleted() && WizardIsVisible();
+ return !HasSyncSetupCompleted() &&
+ (WizardIsVisible() || bootstrap_sync_authentication_);
}
bool WizardIsVisible() const {
return wizard_.IsVisible();