From fb129a38e3f5148fd564a9df0132a4acbbd01ddb Mon Sep 17 00:00:00 2001 From: "dantasse@chromium.org" Date: Thu, 24 Jun 2010 21:35:47 +0000 Subject: New HTML Sync Setup UI! This paves the way for the Passphrase UI. (coming soon...) 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/2851012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50774 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/options/content_page_view.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/browser/views/options') diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 5a84125..71e3d5c 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -22,6 +22,7 @@ #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/profile.h" #include "chrome/browser/sync/sync_ui_util.h" +#include "chrome/browser/sync/sync_setup_wizard.h" #include "chrome/browser/views/importer_view.h" #include "chrome/browser/views/options/customize_sync_window_view.h" #include "chrome/browser/views/options/options_group_view.h" @@ -157,7 +158,7 @@ void ContentPageView::ButtonPressed( } else if (sender == sync_customize_button_) { // sync_customize_button_ should be invisible if sync is not yet set up. DCHECK(sync_service_->HasSyncSetupCompleted()); - CustomizeSyncWindowView::Show(GetWindow()->GetNativeWindow(), profile()); + sync_service_->ShowChooseDataTypes(); } } -- cgit v1.1