summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authordantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 20:37:31 +0000
committerdantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 20:37:31 +0000
commit4ae3d4e71fcd94412d9957a0be05a3479e332b8d (patch)
tree397bd07dd97621d5f012e728b84f9bdac23d8e38 /chrome/browser/sync
parent3e56955fa25579255bb139dd1c33804c4a7fee14 (diff)
downloadchromium_src-4ae3d4e71fcd94412d9957a0be05a3479e332b8d.zip
chromium_src-4ae3d4e71fcd94412d9957a0be05a3479e332b8d.tar.gz
chromium_src-4ae3d4e71fcd94412d9957a0be05a3479e332b8d.tar.bz2
Fix Chrome OS pre-initial-sync options messaging.
When you first logged in to Chrome OS, it used to say "your account is not set up to sync" until you downloaded the initial sync. Now it follows the regular sync signup flow where it's "account details are not yet entered" until the authentication happens, then it's "setup in progress" while downloading the initial download, then it's "your account is set up to sync." BUG=maybe in chrome OS tracker? TEST=build chrome OS. log in to chrome OS with a new account. Immediately check wrench->options->personal stuff. It should not say "your account is not set up to sync..." Review URL: http://codereview.chromium.org/2023004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-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();