diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 08:50:01 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 08:50:01 +0000 |
| commit | ec5c5f2cc84954fc2e745887bea3f006c5f8e7d7 (patch) | |
| tree | 7882f0c03bb20fa62d31c82fadd4a13a9682df27 /chrome/browser/profile.cc | |
| parent | 74532a5880470f854def44a862a79af012bfd395 (diff) | |
| download | chromium_src-ec5c5f2cc84954fc2e745887bea3f006c5f8e7d7.zip chromium_src-ec5c5f2cc84954fc2e745887bea3f006c5f8e7d7.tar.gz chromium_src-ec5c5f2cc84954fc2e745887bea3f006c5f8e7d7.tar.bz2 | |
Restore disable-sync flag.
r52288 accidentally nuked the --disable-sync command line flag, make it work
again.
BUG=none
TEST=Starting with --disable-sync should actually disable sync
Review URL: http://codereview.chromium.org/2943016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52466 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 570371b..acf4802 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -1647,6 +1647,8 @@ TokenService* ProfileImpl::GetTokenService() { } ProfileSyncService* ProfileImpl::GetProfileSyncService() { + if (!ProfileSyncService::IsSyncEnabled()) + return NULL; if (!sync_service_.get()) InitSyncService(); return sync_service_.get(); |