Reverting half the checkins that are suspected of breaking the world.

chrome/browser/ui/webui/options/language_options_handler_common.cc

 // 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/ui/webui/options/language_options_handler_common.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 46 matching lines @@
           IDS_OPTIONS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE,
           product_name));
   localized_strings->SetString("display_in_this_language",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE,
           product_name));
   localized_strings->SetString("this_language_is_currently_in_use",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_THIS_LANGUAGE_IS_CURRENTLY_IN_USE,
           product_name));
-  localized_strings->SetString("restart_required",
-          l10n_util::GetStringUTF16(IDS_OPTIONS_RELAUNCH_REQUIRED));
-  // OS X uses the OS native spellchecker so no need for these strings.
-#if !defined(OS_MACOSX)
   localized_strings->SetString("use_this_for_spell_checking",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_USE_THIS_FOR_SPELL_CHECKING));
   localized_strings->SetString("cannot_be_used_for_spell_checking",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_CANNOT_BE_USED_FOR_SPELL_CHECKING));
   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_RELAUNCH_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));
-#endif  // !OS_MACOSX
   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));
   localized_strings->SetString("restart_button",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_RELAUNCH_BUTTON));
 
   // The following are resources, rather than local strings.
   localized_strings->SetString("currentUiLanguageCode",
@@ skipping 62 matching lines @@
 }
 
 void LanguageOptionsHandlerCommon::SpellCheckLanguageChangeCallback(
     const ListValue* args) {
   const std::string language_code = UTF16ToASCII(ExtractStringValue(args));
   CHECK(!language_code.empty());
   const std::string action = base::StringPrintf(
       "LanguageOptions_SpellCheckLanguageChange_%s", language_code.c_str());
   UserMetrics::RecordComputedAction(action);
 }