diff options
| author | dantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 20:49:04 +0000 |
|---|---|---|
| committer | dantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 20:49:04 +0000 |
| commit | a7ab833c92b6d9bd23fbd98b5650a2508ad65aba (patch) | |
| tree | 6369fd571af8a8d297537056de6dd63f8a36af47 /chrome/common | |
| parent | 4f30638aceaf44af1d12cca32a2c39dbcca48bd9 (diff) | |
| download | chromium_src-a7ab833c92b6d9bd23fbd98b5650a2508ad65aba.zip chromium_src-a7ab833c92b6d9bd23fbd98b5650a2508ad65aba.tar.gz chromium_src-a7ab833c92b6d9bd23fbd98b5650a2508ad65aba.tar.bz2 | |
The "Customize Sync" dialog will let users select to sync or not sync each data type (bookmarks, preferences, etc).
The Customize Sync dialog appears if you click a button on the gaia login or the Options->Personal Stuff tab. This button only appears if you've set the --enable-sync-preferences or --enable-sync-autofill command-line flag.
On the Gaia login, the Customize Sync button grays out when you click 'sign in'. If the "customize sync" dialog is open, it closes when you click "cancel" on the Gaia login, and it accepts when you log in to Gaia.
Removed "Merge and Sync" from the login sequence. Also deleted the 'merge_allowed' parameter from DataTypeController and its subclasses.
Fixed strings so they all refer to "Google Chrome/Chromium sync" instead of "Bookmark sync".
BUG=34209,27259
TEST=none
Review URL: http://codereview.chromium.org/1134002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/pref_names.cc | 6 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index fc65d58..ad7efad 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -690,6 +690,12 @@ const wchar_t kSyncLastSyncedTime[] = L"sync.last_synced_time"; // Boolean specifying whether the user finished setting up sync. const wchar_t kSyncHasSetupCompleted[] = L"sync.has_setup_completed"; +// Booleans specifying whether the user has selected to sync the following +// datatypes. +const wchar_t kSyncBookmarks[] = L"sync.bookmarks"; +const wchar_t kSyncPreferences[] = L"sync.preferences"; +const wchar_t kSyncAutofill[] = L"sync.autofill"; + // Whether sync auth was bootstrapped for Chrome OS. const wchar_t kSyncBootstrappedAuth[] = L"sync.bootstrapped_auth"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 21cf129..9bd65cd 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -251,6 +251,9 @@ extern const wchar_t kDevToolsSplitLocation[]; extern const wchar_t kSyncLastSyncedTime[]; extern const wchar_t kSyncHasSetupCompleted[]; +extern const wchar_t kSyncBookmarks[]; +extern const wchar_t kSyncPreferences[]; +extern const wchar_t kSyncAutofill[]; extern const wchar_t kSyncBootstrappedAuth[]; extern const wchar_t kWebAppCreateOnDesktop[]; |