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/chrome_browser.gypi | |
| 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/chrome_browser.gypi')
| -rwxr-xr-x | chrome/chrome_browser.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index ecf21dd..de4379b 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2270,6 +2270,8 @@ 'browser/views/options/cookie_filter_page_view.h', 'browser/views/options/cookies_view.cc', 'browser/views/options/cookies_view.h', + 'browser/views/options/customize_sync_window_view.cc', + 'browser/views/options/customize_sync_window_view.h', 'browser/views/options/exception_editor_view.cc', 'browser/views/options/exception_editor_view.h', 'browser/views/options/exceptions_view.cc', |