New HTML Sync Setup UI.

Was reverted because of a valgrind error. This is try #2.

Old flow:
- type username/password. wait for Gaia auth and initial sync (with throbber)
- success! or error.

New flow:
- type username/password. wait for Gaia auth. (with throbber)
- error, or choose your datatypes. you can choose "keep everything synced", which will sync all present and future datatypes, or you can pick one by one.
- wait for initial sync (with throbber)
- success! or error, which brings you back to the gaia auth screen.

Smaller details:
- removed the Customize button from gaia_login.html; further removal of the old native Customize dialog to follow.
- added a logging statement to log if you cancel from the Choose Data Types screen.
- added a pref to the profile for whether you want to "keep everything synced" or choose one by one.
- added a couple more strings. Not final yet, I don't think.

BUG=45869
TEST=Exercise all the different paths through the login flow.

Review URL: http://codereview.chromium.org/2880001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50902 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 1 deletions

diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 09cca77..a12decc 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -846,6 +846,11 @@ 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";
 
+// Boolean specifying whether to automatically sync all data types (including
+// future ones, as they're added).  If this is true, the following preferences
+// (kSyncBookmarks, kSyncPasswords, etc.) can all be ignored.
+const wchar_t kKeepEverythingSynced[] = L"sync.keep_everything_synced";
+
 // Booleans specifying whether the user has selected to sync the following
 // datatypes.
 const wchar_t kSyncBookmarks[] = L"sync.bookmarks";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 61763e0..90593f9 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -308,6 +308,7 @@ extern const wchar_t kDevToolsSplitLocation[];
 
 extern const wchar_t kSyncLastSyncedTime[];
 extern const wchar_t kSyncHasSetupCompleted[];
+extern const wchar_t kKeepEverythingSynced[];
 extern const wchar_t kSyncBookmarks[];
 extern const wchar_t kSyncPasswords[];
 extern const wchar_t kSyncPreferences[];
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 58a7a69..5bb6ba8 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -98,7 +98,7 @@ const char kChromeUIThumbnailPath[] = "thumb";
 
 const char kSyncResourcesHost[] = "syncresources";
 const char kSyncGaiaLoginPath[] = "gaialogin";
-const char kSyncMergeAndSyncPath[] = "mergeandsync";
+const char kSyncChooseDataTypesPath[] = "choosedatatypes";
 const char kSyncThrobberPath[] = "throbber.png";
 const char kSyncSetupFlowPath[] = "setup";
 const char kSyncSetupDonePath[] = "setupdone";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index d878e10..b83c928 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -95,6 +95,7 @@ extern const char kChromeUIThemePath[];
 extern const char kSyncResourcesHost[];
 extern const char kSyncGaiaLoginPath[];
 extern const char kSyncMergeAndSyncPath[];
+extern const char kSyncChooseDataTypesPath[];
 extern const char kSyncSetupDonePath[];
 extern const char kSyncSetupFlowPath[];
 extern const char kSyncThrobberPath[];