summaryrefslogtreecommitdiffstats
path: root/chrome/common/url_constants.cc
diff options
context:
space:
mode:
authordantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 22:38:00 +0000
committerdantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 22:38:00 +0000
commit8c94d63f7a6e071bdc90648d614f1825cea195d0 (patch)
tree190f58e4bf11d699fe558561118a98db92671efc /chrome/common/url_constants.cc
parentc5ab18a10e5ab5f10fb5856cb83d3c4835fd9e8c (diff)
downloadchromium_src-8c94d63f7a6e071bdc90648d614f1825cea195d0.zip
chromium_src-8c94d63f7a6e071bdc90648d614f1825cea195d0.tar.gz
chromium_src-8c94d63f7a6e071bdc90648d614f1825cea195d0.tar.bz2
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
Diffstat (limited to 'chrome/common/url_constants.cc')
-rw-r--r--chrome/common/url_constants.cc2
1 files changed, 1 insertions, 1 deletions
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";