dom-ui settings: enable languages & spell checker settings for all platforms....

chrome/browser/dom_ui/options/language_options_handler.cc

Index: chrome/browser/dom_ui/options/language_options_handler.cc
===================================================================
--- chrome/browser/dom_ui/options/language_options_handler.cc	(revision 71884)
+++ chrome/browser/dom_ui/options/language_options_handler.cc	(working copy)
@@ -2,10 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(csilv): This is for the move CL.  Changes to make this cross-platform
-// will come in the followup CL.
-#if defined(OS_CHROMEOS)
-
 #include "chrome/browser/dom_ui/options/language_options_handler.h"
 
 #include <map>
@@ -16,23 +12,27 @@
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/input_method_library.h"
-#include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/spellcheck_common.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
-namespace chromeos {
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/input_method_library.h"
+#endif
 
 LanguageOptionsHandler::LanguageOptionsHandler() {
 }
@@ -43,60 +43,42 @@
 void LanguageOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
+  string16 product_name;
+#if defined(OS_CHROMEOS)
+  product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
+#else
+  product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
+#endif
   localized_strings->SetString("languagePage",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_DIALOG_TITLE));
   localized_strings->SetString("add_button",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_BUTTON));
-  localized_strings->SetString("configure",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_CONFIGURE));
-  localized_strings->SetString("input_method",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD));
   localized_strings->SetString("languages",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_LANGUAGES));
-  localized_strings->SetString("please_add_another_input_method",
-      l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_LANGUAGES_PLEASE_ADD_ANOTHER_INPUT_METHOD));
   localized_strings->SetString("please_add_another_language",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_PLEASE_ADD_ANOTHER_LANGUAGE));
-  localized_strings->SetString("ok_button", l10n_util::GetStringUTF16(IDS_OK));
   localized_strings->SetString("remove_button",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_REMOVE_BUTTON));
-  localized_strings->SetString("sign_out_button",
-      l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_LANGUAGES_SIGN_OUT_BUTTON));
   localized_strings->SetString("add_language_instructions",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_LANGUAGE_INSTRUCTIONS));
-  localized_strings->SetString("input_method_instructions",
-      l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_INSTRUCTIONS));
-  localized_strings->SetString("switch_input_methods_hint",
-      l10n_util::GetStringFUTF16(
-          IDS_OPTIONS_SETTINGS_LANGUAGES_SWITCH_INPUT_METHODS_HINT,
-          ASCIIToUTF16("alt+shift")));
-  localized_strings->SetString("select_previous_input_method_hint",
-      l10n_util::GetStringFUTF16(
-          IDS_OPTIONS_SETTINGS_LANGUAGES_SELECT_PREVIOUS_INPUT_METHOD_HINT,
-          ASCIIToUTF16("ctrl+space")));
   localized_strings->SetString("cannot_be_displayed_in_this_language",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_CANNOT_BE_DISPLAYED_IN_THIS_LANGUAGE,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME)));
+          product_name));
   localized_strings->SetString("is_displayed_in_this_language",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME)));
+          product_name));
   localized_strings->SetString("display_in_this_language",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME)));
-  localized_strings->SetString("sign_out_required",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_RESTART_REQUIRED));
+          product_name));
   localized_strings->SetString("this_language_is_currently_in_use",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_THIS_LANGUAGE_IS_CURRENTLY_IN_USE,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME)));
+          product_name));
   localized_strings->SetString("use_this_for_spell_checking",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_USE_THIS_FOR_SPELL_CHECKING));
@@ -106,23 +88,73 @@
   localized_strings->SetString("is_used_for_spell_checking",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_IS_USED_FOR_SPELL_CHECKING));
+  localized_strings->SetString("restart_required",
+          l10n_util::GetStringUTF16(IDS_OPTIONS_RESTART_REQUIRED));
+  localized_strings->SetString("enable_spell_check",
+          l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SPELLCHECK));
+  localized_strings->SetString("enable_auto_spell_correction",
+          l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_AUTO_SPELL_CORRECTION));
+  localized_strings->SetString("add_language_title",
+          l10n_util::GetStringUTF16(IDS_OPTIONS_LANGUAGES_ADD_TITLE));
+  localized_strings->SetString("add_language_select_label",
+          l10n_util::GetStringUTF16(IDS_OPTIONS_LANGUAGES_ADD_SELECT_LABEL));
 
-  // GetSupportedInputMethods() never return NULL.
-  scoped_ptr<InputMethodDescriptors> descriptors(
-      CrosLibrary::Get()->GetInputMethodLibrary()->GetSupportedInputMethods());
+#if defined(OS_CHROMEOS)
+  localized_strings->SetString("ok_button", l10n_util::GetStringUTF16(IDS_OK));
+  localized_strings->SetString("configure",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_CONFIGURE));
+  localized_strings->SetString("input_method",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD));
+  localized_strings->SetString("please_add_another_input_method",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_PLEASE_ADD_ANOTHER_INPUT_METHOD));
+  localized_strings->SetString("input_method_instructions",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_INSTRUCTIONS));
+  localized_strings->SetString("switch_input_methods_hint",
+      l10n_util::GetStringFUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_SWITCH_INPUT_METHODS_HINT,
+          ASCIIToUTF16("alt+shift")));
+  localized_strings->SetString("select_previous_input_method_hint",
+      l10n_util::GetStringFUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_SELECT_PREVIOUS_INPUT_METHOD_HINT,
+          ASCIIToUTF16("ctrl+space")));
+  localized_strings->SetString("restart_button",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_SIGN_OUT_BUTTON));
+#else
+  localized_strings->SetString("restart_button",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_RESTART_BUTTON));
+#endif
 
   // The followigns are resources, rather than local strings.
   localized_strings->SetString("currentUiLanguageCode",
-      g_browser_process->GetApplicationLocale());
-  localized_strings->Set("inputMethodList", GetInputMethodList(*descriptors));
-  localized_strings->Set("languageList", GetLanguageList(*descriptors));
+                               g_browser_process->GetApplicationLocale());
   localized_strings->Set("spellCheckLanguageCodeSet",
                          GetSpellCheckLanguageCodeSet());
   localized_strings->Set("uiLanguageCodeSet", GetUiLanguageCodeSet());
+
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  bool experimental_spell_check_features =
+      command_line.HasSwitch(switches::kExperimentalSpellcheckerFeatures);
+  localized_strings->SetString("experimentalSpellCheckFeatures",
+      experimental_spell_check_features ? "true" : "false");
+
+#if defined(OS_CHROMEOS)
+  // GetSupportedInputMethods() never return NULL.
+  scoped_ptr<chromeos::InputMethodDescriptors> descriptors(
+      chromeos::CrosLibrary::Get()->GetInputMethodLibrary()->GetSupportedInputMethods());

[James Hawkins, 2011/01/20 03:11:08]

80cols.

[csilv, 2011/01/20 20:09:55]

Done.

+  localized_strings->Set("languageList", GetLanguageList(*descriptors));
+  localized_strings->Set("inputMethodList", GetInputMethodList(*descriptors));
+#else
+  localized_strings->Set("languageList", GetLanguageList());
+#endif
 }
 
 void LanguageOptionsHandler::RegisterMessages() {
   DCHECK(dom_ui_);
+#if defined(OS_CHROMEOS)
   dom_ui_->RegisterMessageCallback("inputMethodDisable",
       NewCallback(this, &LanguageOptionsHandler::InputMethodDisableCallback));
   dom_ui_->RegisterMessageCallback("inputMethodEnable",
@@ -130,6 +162,7 @@
   dom_ui_->RegisterMessageCallback("inputMethodOptionsOpen",
       NewCallback(this,
                   &LanguageOptionsHandler::InputMethodOptionsOpenCallback));
+#endif
   dom_ui_->RegisterMessageCallback("languageOptionsOpen",
       NewCallback(this, &LanguageOptionsHandler::LanguageOptionsOpenCallback));
   dom_ui_->RegisterMessageCallback("spellCheckLanguageChange",
@@ -137,20 +170,21 @@
                   &LanguageOptionsHandler::SpellCheckLanguageChangeCallback));
   dom_ui_->RegisterMessageCallback("uiLanguageChange",
       NewCallback(this, &LanguageOptionsHandler::UiLanguageChangeCallback));
-  dom_ui_->RegisterMessageCallback("uiLanguageSignOut",
-      NewCallback(this, &LanguageOptionsHandler::SignOutCallback));
+  dom_ui_->RegisterMessageCallback("uiLanguageRestart",
+      NewCallback(this, &LanguageOptionsHandler::RestartCallback));
 }
 
+#if defined(OS_CHROMEOS)
 ListValue* LanguageOptionsHandler::GetInputMethodList(
-    const InputMethodDescriptors& descriptors) {
+    const chromeos::InputMethodDescriptors& descriptors) {
   ListValue* input_method_list = new ListValue();
 
   for (size_t i = 0; i < descriptors.size(); ++i) {
-    const InputMethodDescriptor& descriptor = descriptors[i];
+    const chromeos::InputMethodDescriptor& descriptor = descriptors[i];
     const std::string language_code =
-        input_method::GetLanguageCodeFromDescriptor(descriptor);
+        chromeos::input_method::GetLanguageCodeFromDescriptor(descriptor);
     const std::string display_name =
-        input_method::GetInputMethodDisplayNameFromId(descriptor.id);
+        chromeos::input_method::GetInputMethodDisplayNameFromId(descriptor.id);
 
     DictionaryValue* dictionary = new DictionaryValue();
     dictionary->SetString("id", descriptor.id);
@@ -162,11 +196,12 @@
     language_codes->SetBoolean(language_code, true);
     // Check kExtraLanguages to see if there are languages associated with
     // this input method. If these are present, add these.
-    for (size_t j = 0; j < arraysize(input_method::kExtraLanguages); ++j) {
+    for (size_t j = 0; j < arraysize(chromeos::input_method::kExtraLanguages);
+         ++j) {
       const std::string extra_input_method_id =
-          input_method::kExtraLanguages[j].input_method_id;
+          chromeos::input_method::kExtraLanguages[j].input_method_id;
       const std::string extra_language_code =
-          input_method::kExtraLanguages[j].language_code;
+          chromeos::input_method::kExtraLanguages[j].language_code;
       if (extra_input_method_id == descriptor.id) {
         language_codes->SetBoolean(extra_language_code, true);
       }
@@ -180,19 +215,20 @@
 }
 
 ListValue* LanguageOptionsHandler::GetLanguageList(
-    const InputMethodDescriptors& descriptors) {
+    const chromeos::InputMethodDescriptors& descriptors) {
   std::set<std::string> language_codes;
   // Collect the language codes from the supported input methods.
   for (size_t i = 0; i < descriptors.size(); ++i) {
-    const InputMethodDescriptor& descriptor = descriptors[i];
+    const chromeos::InputMethodDescriptor& descriptor = descriptors[i];
     const std::string language_code =
-        input_method::GetLanguageCodeFromDescriptor(descriptor);
+        chromeos::input_method::GetLanguageCodeFromDescriptor(descriptor);
     language_codes.insert(language_code);
   }
   // Collect the language codes from kExtraLanguages.
-  for (size_t i = 0; i < arraysize(input_method::kExtraLanguages); ++i) {
+  for (size_t i = 0; i < arraysize(chromeos::input_method::kExtraLanguages);
+       ++i) {
     const char* language_code =
-        input_method::kExtraLanguages[i].language_code;
+        chromeos::input_method::kExtraLanguages[i].language_code;
     language_codes.insert(language_code);
   }
 
@@ -210,9 +246,9 @@
   for (std::set<std::string>::const_iterator iter = language_codes.begin();
        iter != language_codes.end(); ++iter) {
     const string16 display_name =
-        input_method::GetLanguageDisplayNameFromCode(*iter);
+        chromeos::input_method::GetLanguageDisplayNameFromCode(*iter);
     const string16 native_display_name =
-        input_method::GetLanguageNativeDisplayNameFromCode(*iter);
+        chromeos::input_method::GetLanguageNativeDisplayNameFromCode(*iter);
     display_names.push_back(display_name);
     language_map[display_name] =
         std::make_pair(*iter, native_display_name);
@@ -236,7 +272,56 @@
 
   return language_list;
 }
+#endif
 
+#if !defined(OS_CHROMEOS)
+ListValue* LanguageOptionsHandler::GetLanguageList() {
+  // Collect the language codes from the supported accept-languages.
+  const std::string app_locale = g_browser_process->GetApplicationLocale();
+  std::vector<std::string> language_codes;
+  l10n_util::GetAcceptLanguagesForLocale(app_locale, &language_codes);
+
+  // Map of display name -> {language code, native_display_name}.
+  // In theory, we should be able to create a map that is sorted by
+  // display names using ICU comparator, but doing it is hard, thus we'll
+  // use an auxiliary vector to achieve the same result.
+  typedef std::pair<std::string, string16> LanguagePair;
+  typedef std::map<string16, LanguagePair> LanguageMap;
+  LanguageMap language_map;
+  // The auxiliary vector mentioned above.
+  std::vector<string16> display_names;
+
+  // Build the list of display names, and build the language map.
+  for (size_t i = 0; i < language_codes.size(); ++i) {
+    const string16 display_name =
+        l10n_util::GetDisplayNameForLocale(language_codes[i], app_locale, true);
+    const string16 native_display_name =
+        l10n_util::GetDisplayNameForLocale(language_codes[i], language_codes[i],
+                                           true);
+    display_names.push_back(display_name);
+    language_map[display_name] =
+        std::make_pair(language_codes[i], native_display_name);
+  }
+  DCHECK_EQ(display_names.size(), language_map.size());
+
+  // Sort display names using locale specific sorter.
+  l10n_util::SortStrings16(app_locale, &display_names);
+
+  // Build the language list from the language map.
+  ListValue* language_list = new ListValue();
+  for (size_t i = 0; i < display_names.size(); ++i) {
+    const LanguagePair& pair = language_map[display_names[i]];
+    DictionaryValue* dictionary = new DictionaryValue();
+    dictionary->SetString("code",  pair.first);
+    dictionary->SetString("displayName", display_names[i]);
+    dictionary->SetString("nativeDisplayName", pair.second);
+    language_list->Append(dictionary);
+  }
+
+  return language_list;
+}
+#endif
+
 DictionaryValue* LanguageOptionsHandler::GetUiLanguageCodeSet() {
   DictionaryValue* dictionary = new DictionaryValue();
   const std::vector<std::string>& available_locales =
@@ -257,6 +342,7 @@
   return dictionary;
 }
 
+#if defined(OS_CHROMEOS)
 void LanguageOptionsHandler::InputMethodDisableCallback(
     const ListValue* args) {
   const std::string input_method_id = WideToASCII(ExtractStringValue(args));
@@ -280,6 +366,7 @@
       "InputMethodOptions_Open_%s", input_method_id.c_str());
   UserMetrics::RecordComputedAction(action);
 }
+#endif
 
 void LanguageOptionsHandler::LanguageOptionsOpenCallback(
     const ListValue* args) {
@@ -293,7 +380,12 @@
   const std::string action = StringPrintf(
       "LanguageOptions_UiLanguageChange_%s", language_code.c_str());
   UserMetrics::RecordComputedAction(action);
+#if defined(OS_CHROMEOS)
   dom_ui_->GetProfile()->ChangeApplicationLocale(language_code, false);
+#else
+  PrefService* prefs = dom_ui_->GetProfile()->GetPrefs();
+  prefs->SetString(prefs::kApplicationLocale, language_code);
+#endif
   dom_ui_->CallJavascriptFunction(
       L"options.LanguageOptions.uiLanguageSaved");
 }
@@ -307,16 +399,21 @@
   UserMetrics::RecordComputedAction(action);
 }
 
-void LanguageOptionsHandler::SignOutCallback(const ListValue* args) {
+void LanguageOptionsHandler::RestartCallback(const ListValue* args) {
+#if defined(OS_CHROMEOS)
   UserMetrics::RecordAction(UserMetricsAction("LanguageOptions_SignOut"));
 
   Browser* browser = Browser::GetBrowserForController(
       &dom_ui_->tab_contents()->controller(), NULL);
   if (browser)
     browser->ExecuteCommand(IDC_EXIT);
+#else
+  UserMetrics::RecordAction(UserMetricsAction("LanguageOptions_Restart"));
+
+  // Set the flag to restore state after the restart.
+  PrefService* pref_service = g_browser_process->local_state();
+  pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);
+  BrowserList::CloseAllBrowsersAndExit();
+#endif
 }
 
-}  // namespace chromeos
-
-#endif  // OS_CHROMEOS
-