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

Revert 114382 - Don't display spelling options in "Language Settings" pref panel on OS X

We're removing Hunspell integration in favor of only using the native OS spell checker on OS X, see crbug.com/69944 for more details.

This CL modifieds the "Languages and Settings..." preference pane to remove options related to spelling on the Mac.

Specific changes:
* In .grd file: don't include spelling-related strings on Mac.
* Fixed description for IDS_OPTIONS_SETTINGS_USE_THIS_FOR_SPELL_CHECKING in .grd file to not mention ChromeOS.
* In "Under the Hood" changed button title that opens Languages pref panel to just "Language Settings..." on Mac rather than "Languages and spell-checker Settings..."
* In the Language settings panel - remove the right pane and bottom checkbox on the Mac (these relate to dictionary download and spell checking).
* Change the background color of the language list pane to white on Mac.

You can see before/after screenshots of this change here: crbug.com/69944#c16 .

BUG=69944
TEST="Preferences->Under the hood" should have a "Languages and Spell-checker Settings..." button on non-Mac platforms and the subsequent pref pane should not be modified by this CL. On Mac, the button should be titled "Language Settings..." and the panel that opens should lack the right pane and only contain options to pick and re-order languages - it should not contain options related to spell checking.

Review URL: http://codereview.chromium.org/8917002

TBR=jeremy@chromium.org
Review URL: http://codereview.chromium.org/8940001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114399 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 18 deletions

diff --git a/chrome/browser/resources/options/language_options.css b/chrome/browser/resources/options/language_options.css
index 55b7aa8..c1dc7a4 100644
--- a/chrome/browser/resources/options/language_options.css
+++ b/chrome/browser/resources/options/language_options.css
@@ -39,16 +39,6 @@
   width: 300px;
 }
 
-/* On OS X we use the native OS spellchecker, so don't display the dictionary */
-/* pane. */
-html[os=mac] .language-options-left {
- background-color: white;
-}
-
-html[os=mac] .language-options-right {
- visibility: hidden;
-}
-
 .language-options-lower-left {
   -webkit-box-flex: 0;
   -webkit-padding-start: 12px;
diff --git a/chrome/browser/resources/options/language_options.html b/chrome/browser/resources/options/language_options.html
index 46373c1..3375bd2 100644
--- a/chrome/browser/resources/options/language_options.html
+++ b/chrome/browser/resources/options/language_options.html
@@ -57,7 +57,7 @@
     <div i18n-content="switch_input_methods_hint"></div>
     <div i18n-content="select_previous_input_method_hint"></div>
 </if>
-<if expr="not pp_ifdef('chromeos') and not is_macosx">
+<if expr="not pp_ifdef('chromeos')">
     <div id="spell-check-option" class="checkbox">
       <label>
         <input id="enable-spell-check" pref="browser.enable_spellchecking"
diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js
index 47674ed..452c61c 100644
--- a/chrome/browser/resources/options/language_options.js
+++ b/chrome/browser/resources/options/language_options.js
@@ -93,11 +93,8 @@ cr.define('options', function() {
           $('auto-spell-correction-option').hidden = false;
 
         // Handle spell check enable/disable.
-        if (!cr.isMac) {
-          Preferences.getInstance().addEventListener(
-              this.enableSpellCheckPref,
-              this.updateEnableSpellCheck_.bind(this));
-        }
+        Preferences.getInstance().addEventListener(this.enableSpellCheckPref,
+            this.updateEnableSpellCheck_.bind(this));
       }
 
       // Listen to user clicks on the "Change touch keyboard settings..."
@@ -222,8 +219,7 @@ cr.define('options', function() {
       this.updateSelectedLanguageName_(languageCode);
       if (cr.isWindows || cr.isChromeOS)
         this.updateUiLanguageButton_(languageCode);
-      if (!cr.isMac)
-        this.updateSpellCheckLanguageButton_(languageCode);
+      this.updateSpellCheckLanguageButton_(languageCode);
       if (cr.isChromeOS)
         this.updateInputMethodList_(languageCode);
       this.updateLanguageListInAddLanguageOverlay_();