DOMUI: Move the meat of SyncOptionsHandler into PersonalOptionsHandler.

chrome/browser/dom_ui/options/personal_options_handler.cc

-// 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.
 
 #include "chrome/browser/dom_ui/options/personal_options_handler.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/dom_ui/options/dom_options_util.h"
 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
 #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"
 #include "chrome/browser/ui/options/options_window.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 84 matching lines @@
       Value::CreateStringValue(
           l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_SELECT_DATATYPES)));
   sync_select_list->Append(datatypes);
   ListValue* everything = new ListValue;
   everything->Append(Value::CreateBooleanValue(true));
   everything->Append(
       Value::CreateStringValue(
           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() {
   DCHECK(dom_ui_);
   dom_ui_->RegisterMessageCallback(
       "showSyncLoginDialog",
       NewCallback(this, &PersonalOptionsHandler::ShowSyncLoginDialog));
   dom_ui_->RegisterMessageCallback(
       "themesReset",
       NewCallback(this, &PersonalOptionsHandler::ThemesReset));
 #if defined(TOOLKIT_GTK)
   dom_ui_->RegisterMessageCallback(
       "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,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   if (type == NotificationType::BROWSER_THEME_CHANGED)
     ObserveThemeChanged();
   else
     OptionsPageUIHandler::Observe(type, source, details);
 }
@@ skipping 66 matching lines @@
 
   visible.reset(Value::CreateBooleanValue(status_has_error));
   dom_ui_->CallJavascriptFunction(
     L"PersonalOptions.setSyncStatusErrorVisible", *visible);
 #if !defined(OS_CHROMEOS)
   dom_ui_->CallJavascriptFunction(
     L"PersonalOptions.setSyncActionLinkErrorVisible", *visible);
 #endif
 }
 
+void PersonalOptionsHandler::OnLoginSuccess() {
+  OnStateChanged();
+}
+
+void PersonalOptionsHandler::OnLoginFailure(
+    const GoogleServiceAuthError& error) {
+  OnStateChanged();
+}
+
 void PersonalOptionsHandler::ObserveThemeChanged() {
   Profile* profile = dom_ui_->GetProfile();
 #if defined(TOOLKIT_GTK)
   GtkThemeProvider* provider = GtkThemeProvider::GetFrom(profile);
   bool is_gtk_theme = provider->UseGtkTheme();
   FundamentalValue gtk_enabled(!is_gtk_theme);
   dom_ui_->CallJavascriptFunction(
       L"options.PersonalOptions.setGtkThemeButtonEnabled", gtk_enabled);
 #else
   BrowserThemeProvider* provider =
@@ skipping 19 matching lines @@
   ObserveThemeChanged();
 
   ProfileSyncService* sync_service =
       dom_ui_->GetProfile()->GetProfileSyncService();
   if (sync_service) {
     sync_service->AddObserver(this);
     OnStateChanged();
   } 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) {
 #if defined(OS_CHROMEOS)
   std::string email = chromeos::UserManager::Get()->logged_in_user().email();
   string16 message = l10n_util::GetStringFUTF16(
       IDS_SYNC_LOGIN_INTRODUCTION,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   dom_ui_->GetProfile()->GetBrowserSignin()->RequestSignin(
       dom_ui_->tab_contents(), UTF8ToUTF16(email), message, this);
@@ skipping 10 matching lines @@
   dom_ui_->GetProfile()->ClearTheme();
 }
 
 #if defined(TOOLKIT_GTK)
 void PersonalOptionsHandler::ThemesSetGTK(const ListValue* args) {
   UserMetricsRecordAction(UserMetricsAction("Options_GtkThemeSet"));
   dom_ui_->GetProfile()->SetNativeTheme();
 }
 #endif
 
-void PersonalOptionsHandler::OnLoginSuccess() {
-  OnStateChanged();
+void PersonalOptionsHandler::OnPreferredDataTypesUpdated(
+    const ListValue* args) {
+  NotificationService::current()->Notify(
+      NotificationType::SYNC_DATA_TYPES_UPDATED,
+      Source<Profile>(dom_ui_->GetProfile()),
+      NotificationService::NoDetails());
 }
-
-void PersonalOptionsHandler::OnLoginFailure(
-    const GoogleServiceAuthError& error) {
-  OnStateChanged();
-}