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

1 files changed, 23 insertions, 6 deletions

diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h
index 6dbc04f..12489fc 100644
--- a/chrome/browser/sync/sync_setup_flow.h
+++ b/chrome/browser/sync/sync_setup_flow.h
@@ -13,6 +13,9 @@
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_wizard.h"
+#if defined(OS_WIN)
+#include "chrome/browser/views/options/customize_sync_window_view.h"
+#endif
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
@@ -76,16 +79,29 @@ class SyncSetupFlow : public HtmlDialogUIDelegate {
     return false;
   }
 
+  void OnUserClickedCustomize() {
+    service_->OnUserClickedCustomize();
+  }
+
+  void ClickCustomizeOk() {
+#if defined(OS_WIN)
+    CustomizeSyncWindowView::ClickOk();
+#endif
+  }
+
+  void ClickCustomizeCancel() {
+#if defined(OS_WIN)
+    CustomizeSyncWindowView::ClickCancel();
+#endif
+  }
+
+
   void OnUserSubmittedAuth(const std::string& username,
                            const std::string& password,
                            const std::string& captcha) {
     service_->OnUserSubmittedAuth(username, password, captcha);
   }
 
-  void OnUserAcceptedMergeAndSync() {
-    service_->OnUserAcceptedMergeAndSync();
-  }
-
  private:
   FRIEND_TEST(SyncSetupWizardTest, InitialStepLogin);
   FRIEND_TEST(SyncSetupWizardTest, InitialStepMergeAndSync);
@@ -154,6 +170,9 @@ class FlowHandler : public DOMMessageHandler {
   virtual void RegisterMessages();
 
   // Callbacks from the page.
+  void HandleUserClickedCustomize(const Value* value);
+  void ClickCustomizeOk(const Value* value);
+  void ClickCustomizeCancel(const Value* value);
   void HandleSubmitAuth(const Value* value);
   void HandleSubmitMergeAndSync(const Value* value);
 
@@ -161,8 +180,6 @@ class FlowHandler : public DOMMessageHandler {
   void ShowGaiaLogin(const DictionaryValue& args);
   void ShowGaiaSuccessAndClose();
   void ShowGaiaSuccessAndSettingUp();
-  void ShowMergeAndSync();
-  void ShowMergeAndSyncError();
   void ShowSetupDone(const std::wstring& user);
   void ShowFirstTimeDone(const std::wstring& user);