From a7ab833c92b6d9bd23fbd98b5650a2508ad65aba Mon Sep 17 00:00:00 2001 From: "dantasse@chromium.org" Date: Wed, 31 Mar 2010 20:49:04 +0000 Subject: 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 --- chrome/app/resources/locale_settings.grd | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'chrome/app/resources') diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index d3b974e..498b73b2 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -302,6 +302,15 @@ 27 + + + + 60 + + + 10 + + -- cgit v1.1