DOMUI: Move the meat of SyncOptionsHandler into PersonalOptionsHandler.

chrome/browser/dom_ui/options/personal_options_handler.cc

Index: chrome/browser/dom_ui/options/personal_options_handler.cc
diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc
index 7102a7ac8b59fb89996110084e680bb625c2cad6..a1decb77c86ad8ed9ecfe1f565a6a4cae2c695bf 100644
--- a/chrome/browser/dom_ui/options/personal_options_handler.cc
+++ b/chrome/browser/dom_ui/options/personal_options_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -20,6 +20,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/options/options_page_base.h"
@@ -124,6 +125,33 @@ void PersonalOptionsHandler::GetLocalizedValues(
           l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_SELECT_EVERYTHING)));
   sync_select_list->Append(everything);
   localized_strings->Set("syncSelectList", sync_select_list);
+
+  if (!ProfileSyncService::IsSyncEnabled())
+    return;

[James Hawkins, 2011/01/17 23:46:18]

The sync strings should be loaded regardless of whether Sync happens to be
enabled when this page is initialized or not.

[tfarina, 2011/01/17 23:52:17]

Removed.

+
+  // Sync page - ChromeOS

[James Hawkins, 2011/01/17 23:46:18]

s/ - ChromeOS/./

[tfarina, 2011/01/17 23:52:17]

Done.

+  localized_strings->SetString("syncPage",
+      l10n_util::GetStringUTF16(IDS_SYNC_NTP_SYNC_SECTION_TITLE));
+  localized_strings->SetString("sync_title",
+      l10n_util::GetStringUTF16(IDS_CUSTOMIZE_SYNC_DESCRIPTION));
+  localized_strings->SetString("syncsettings",
+      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_PREFERENCES));
+  localized_strings->SetString("syncbookmarks",
+      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_BOOKMARKS));
+  localized_strings->SetString("synctypedurls",
+      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_TYPED_URLS));
+  localized_strings->SetString("syncpasswords",
+      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_PASSWORDS));
+  localized_strings->SetString("syncextensions",
+      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_EXTENSIONS));
+  localized_strings->SetString("syncautofill",
+      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_AUTOFILL));
+  localized_strings->SetString("syncthemes",
+      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_THEMES));
+  localized_strings->SetString("syncapps",
+      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_APPS));
+  localized_strings->SetString("syncsessions",
+      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_SESSIONS));
 }
 
 void PersonalOptionsHandler::RegisterMessages() {
@@ -139,6 +167,10 @@ void PersonalOptionsHandler::RegisterMessages() {
       "themesSetGTK",
       NewCallback(this, &PersonalOptionsHandler::ThemesSetGTK));
 #endif
+  if (!ProfileSyncService::IsSyncEnabled())

[James Hawkins, 2011/01/17 23:46:18]

Same as above.

[tfarina, 2011/01/17 23:52:17]

Removed.

+    return;
+  dom_ui_->RegisterMessageCallback("updatePreferredDataTypes",
+      NewCallback(this, &PersonalOptionsHandler::OnPreferredDataTypesUpdated));
 }
 
 void PersonalOptionsHandler::Observe(NotificationType type,
@@ -225,6 +257,15 @@ void PersonalOptionsHandler::OnStateChanged() {
 #endif
 }
 
+void PersonalOptionsHandler::OnLoginSuccess() {
+  OnStateChanged();
+}
+
+void PersonalOptionsHandler::OnLoginFailure(
+    const GoogleServiceAuthError& error) {
+  OnStateChanged();
+}
+
 void PersonalOptionsHandler::ObserveThemeChanged() {
   Profile* profile = dom_ui_->GetProfile();
 #if defined(TOOLKIT_GTK)
@@ -264,6 +305,18 @@ void PersonalOptionsHandler::Initialize() {
   } else {
     dom_ui_->CallJavascriptFunction(L"options.PersonalOptions.hideSyncSection");
   }
+
+  if (!sync_service)

[James Hawkins, 2011/01/17 23:46:18]

if (sync_service) is 7 lines above. Please refactor this logic.

[tfarina, 2011/01/17 23:52:17]

Done.

+    return;  // Can happen in ChromeOS if called before login.
+
+  if (!ProfileSyncService::IsSyncEnabled())

[James Hawkins, 2011/01/17 23:46:18]

As above, whether sync is enabled or not has nothing to do with initialization. 
That handling is done in OnStateChanged.

[tfarina, 2011/01/17 23:52:17]

Removed.

+    return;
+
+  DictionaryValue args;
+  SyncSetupFlow::GetArgsForConfigure(sync_service, &args);
+
+  dom_ui_->CallJavascriptFunction(
+      L"PersonalOptions.setRegisteredDataTypes", args);
 }
 
 void PersonalOptionsHandler::ShowSyncLoginDialog(const ListValue* args) {
@@ -294,11 +347,10 @@ void PersonalOptionsHandler::ThemesSetGTK(const ListValue* args) {
 }
 #endif
 
-void PersonalOptionsHandler::OnLoginSuccess() {
-  OnStateChanged();
-}
-
-void PersonalOptionsHandler::OnLoginFailure(
-    const GoogleServiceAuthError& error) {
-  OnStateChanged();
+void PersonalOptionsHandler::OnPreferredDataTypesUpdated(
+    const ListValue* args) {
+  NotificationService::current()->Notify(
+      NotificationType::SYNC_DATA_TYPES_UPDATED,
+      Source<Profile>(dom_ui_->GetProfile()),
+      NotificationService::NoDetails());
 }