diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 18:56:53 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 18:56:53 +0000 |
| commit | 1def39fff07b3f852370fb96c603b03bec9a9ad2 (patch) | |
| tree | 41161188fb3c92c5cf1e0553a111e0d782d33bbf /chrome/browser/web_resource/web_resource_service.cc | |
| parent | a2d0818cc547b463261d33500903587b6f14ca8c (diff) | |
| download | chromium_src-1def39fff07b3f852370fb96c603b03bec9a9ad2.zip chromium_src-1def39fff07b3f852370fb96c603b03bec9a9ad2.tar.gz chromium_src-1def39fff07b3f852370fb96c603b03bec9a9ad2.tar.bz2 | |
Fix sync in Chromium-os by not allowing CanShowPromo to initialize the sync system.
BUG=http://code.google.com/p/chromium-os/issues/detail?id=10031
TEST=cros sync works
Review URL: http://codereview.chromium.org/5685004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_resource/web_resource_service.cc')
| -rw-r--r-- | chrome/browser/web_resource/web_resource_service.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index bb6a113..ab557f5 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -518,10 +518,14 @@ bool CanShowPromo(Profile* profile) { } } + // Note that HasProfileSyncService() will be false for ChromeOS, so + // promo_options will only be true if the user has an extension installed. + // See http://crosbug/10209 bool promo_options = - sync_ui_util::GetStatus( - profile->GetProfileSyncService()) == sync_ui_util::SYNCED || - has_extensions; + (profile->HasProfileSyncService() && + sync_ui_util::GetStatus( + profile->GetProfileSyncService()) == sync_ui_util::SYNCED) || + has_extensions; return !promo_closed && promo_options && |