Reland https://chromiumcodereview.appspot.com/9295010/

Hide accessibility options for unimplemented features.

BUG=chromium-os:25272
TEST=Open the systems options page, make sure there is only one a11y option

Review URL: https://chromiumcodereview.appspot.com/9325058

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

4 files changed, 6 insertions, 78 deletions

diff --git a/chrome/browser/resources/options/chromeos/system_options.html b/chrome/browser/resources/options/chromeos/system_options.html
index 8699938..3379344 100644
--- a/chrome/browser/resources/options/chromeos/system_options.html
+++ b/chrome/browser/resources/options/chromeos/system_options.html
@@ -122,30 +122,6 @@
             </label>
           </div>
         </div>
-        <div class="option-name">
-          <div class="checkbox">
-            <label>
-              <input id="accessibility-high-contrast-check" type="checkbox">
-              <span i18n-content="accessibilityHighContrast"></span>
-            </label>
-          </div>
-        </div>
-        <div class="option-name">
-          <div class="checkbox">
-            <label>
-              <input id="accessibility-screen-magnifier-check" type="checkbox">
-              <span i18n-content="accessibilityScreenMagnifier"></span>
-            </label>
-          </div>
-        </div>
-        <div class="option-name">
-          <div class="checkbox">
-            <label>
-              <input id="accessibility-virtual-keyboard-check" type="checkbox">
-              <span i18n-content="accessibilityVirtualKeyboard"></span>
-            </label>
-          </div>
-        </div>
       </div>
     </section>
   </div>
diff --git a/chrome/browser/resources/options/chromeos/system_options.js b/chrome/browser/resources/options/chromeos/system_options.js
index 055f7bf..be41cd3 100644
--- a/chrome/browser/resources/options/chromeos/system_options.js
+++ b/chrome/browser/resources/options/chromeos/system_options.js
@@ -91,18 +91,6 @@ cr.define('options', function() {
         chrome.send('spokenFeedbackChange',
                     [$('accessibility-spoken-feedback-check').checked]);
       };
-      $('accessibility-high-contrast-check').onchange = function(event) {
-        chrome.send('highContrastChange',
-                    [$('accessibility-high-contrast-check').checked]);
-      };
-      $('accessibility-screen-magnifier-check').onchange = function(event) {
-        chrome.send('screenMagnifierChange',
-                    [$('accessibility-screen-magnifier-check').checked]);
-      };
-      $('accessibility-virtual-keyboard-check').onchange = function(event) {
-        chrome.send('virtualKeyboardChange',
-                    [$('accessibility-virtual-keyboard-check').checked]);
-      };
       initializeBrightnessButton_('brightness-decrease-button',
           'decreaseScreenBrightness');
       initializeBrightnessButton_('brightness-increase-button',
@@ -152,21 +140,21 @@ cr.define('options', function() {
    * Set the initial state of the high contrast checkbox.
    */
   SystemOptions.setHighContrastCheckboxState = function(checked) {
-    $('accessibility-high-contrast-check').checked = checked;
+    // TODO(zork): Update UI
   };
 
   /**
    * Set the initial state of the screen magnifier checkbox.
    */
   SystemOptions.setScreenMagnifierCheckboxState = function(checked) {
-    $('accessibility-screen-magnifier-check').checked = checked;
+    // TODO(zork): Update UI
   };
 
   /**
    * Set the initial state of the virtual keyboard checkbox.
    */
   SystemOptions.setVirtualKeyboardCheckboxState = function(checked) {
-    $('accessibility-virtual-keyboard-check').checked = checked;
+    // TODO(zork): Update UI
   };
 
   /**
diff --git a/chrome/browser/resources/options2/advanced_options.html b/chrome/browser/resources/options2/advanced_options.html
index c965642..a74cf2f 100644
--- a/chrome/browser/resources/options2/advanced_options.html
+++ b/chrome/browser/resources/options2/advanced_options.html
@@ -301,30 +301,6 @@
           </label>
         </div>
       </div>
-      <div class="option-name">
-        <div class="checkbox">
-          <label>
-            <input id="accessibility-high-contrast-check" type="checkbox">
-            <span i18n-content="accessibilityHighContrast"></span>
-          </label>
-        </div>
-      </div>
-      <div class="option-name">
-        <div class="checkbox">
-          <label>
-            <input id="accessibility-screen-magnifier-check" type="checkbox">
-            <span i18n-content="accessibilityScreenMagnifier"></span>
-          </label>
-        </div>
-      </div>
-      <div class="option-name">
-        <div class="checkbox">
-          <label>
-            <input id="accessibility-virtual-keyboard-check" type="checkbox">
-            <span i18n-content="accessibilityVirtualKeyboard"></span>
-          </label>
-        </div>
-      </div>
     </div>
   </section>
 </if>
diff --git a/chrome/browser/resources/options2/advanced_options.js b/chrome/browser/resources/options2/advanced_options.js
index a18ef0e..3a8f904 100644
--- a/chrome/browser/resources/options2/advanced_options.js
+++ b/chrome/browser/resources/options2/advanced_options.js
@@ -210,18 +210,6 @@ cr.define('options', function() {
           chrome.send('spokenFeedbackChange',
           [$('accessibility-spoken-feedback-check').checked]);
         };
-        $('accessibility-high-contrast-check').onchange = function(event) {
-          chrome.send('highContrastChange',
-          [$('accessibility-high-contrast-check').checked]);
-        };
-        $('accessibility-screen-magnifier-check').onchange = function(event) {
-          chrome.send('screenMagnifierChange',
-          [$('accessibility-screen-magnifier-check').checked]);
-        };
-        $('accessibility-virtual-keyboard-check').onchange = function(event) {
-          chrome.send('virtualKeyboardChange',
-          [$('accessibility-virtual-keyboard-check').checked]);
-        };
       }
 
       // Background mode section.
@@ -390,21 +378,21 @@ cr.define('options', function() {
    * Set the initial state of the high contrast checkbox.
    */
   AdvancedOptions.setHighContrastCheckboxState = function(checked) {
-    $('accessibility-high-contrast-check').checked = checked;
+    // TODO(zork): Update UI
   };
 
   /**
    * Set the initial state of the screen magnifier checkbox.
    */
   AdvancedOptions.setScreenMagnifierCheckboxState = function(checked) {
-    $('accessibility-screen-magnifier-check').checked = checked;
+    // TODO(zork): Update UI
   };
 
   /**
    * Set the initial state of the virtual keyboard checkbox.
    */
   AdvancedOptions.setVirtualKeyboardCheckboxState = function(checked) {
-    $('accessibility-virtual-keyboard-check').checked = checked;
+    // TODO(zork): Update UI
   };
 
   /**