Update "Predict network actions" UI setting.

chrome/browser/resources/options/browser_options.js

 // Copyright (c) 2012 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.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var RepeatingButton = cr.ui.RepeatingButton;
   var HotwordSearchSettingIndicator = options.HotwordSearchSettingIndicator;
+  var NetworkPredictionOptions = {
+    ALWAYS: 0,
+    WIFI_ONLY: 1,
+    NEVER: 2,
+    UNSET: 3

[stevenjb, 2014/07/30 18:03:29]

Unused?

[Bence, 2014/08/01 14:36:46]

Done.

+  };
 
   //
   // BrowserOptions class
   // Encapsulated handling of browser options page.
   //
   function BrowserOptions() {
     OptionsPage.call(this, 'settings', loadTimeData.getString('settingsTitle'),
                      'settings');
   }
 
@@ skipping 321 matching lines @@
       $('privacyClearDataButton').hidden = OptionsPage.isSettingsApp();
       // 'metricsReportingEnabled' element is only present on Chrome branded
       // builds, and the 'metricsReportingCheckboxAction' message is only
       // handled on ChromeOS.
       if ($('metricsReportingEnabled') && cr.isChromeOS) {
         $('metricsReportingEnabled').onclick = function(event) {
           chrome.send('metricsReportingCheckboxAction',
               [String(event.currentTarget.checked)]);
         };
       }
+      $('networkPredictionOptionsBool').onchange = function(event) {
+        var value = (event.target.checked ?
+            NetworkPredictionOptions.WIFI_ONLY :
+            NetworkPredictionOptions.NEVER);
+        var metric = event.target.metric;
+        Preferences.setIntegerPref(
+            'net.network_prediction_options',
+            value,
+            true,
+            metric);
+      };
+      $('networkPredictionOptionsTristate').onchange = function(event) {
+        var value = event.target.options[event.target.selectedIndex].value;

[stevenjb, 2014/07/30 18:03:29]

nit: assert value <= NEVER

[Bence, 2014/08/01 14:36:47]

Moot: this function is removed as a result of UI review.

+        var metric = event.target.metric;
+        Preferences.setIntegerPref(
+            'net.network_prediction_options',
+            value,
+            true,
+            metric);
+      };
 
       // Bluetooth (CrOS only).
       if (cr.isChromeOS) {
         options.system.bluetooth.BluetoothDeviceList.decorate(
             $('bluetooth-paired-devices-list'));
 
         $('bluetooth-add-device').onclick =
             this.handleAddBluetoothDevice_.bind(this);
 
         $('enable-bluetooth').onchange = function(event) {
@@ skipping 1088 matching lines @@
      * @private
      */
     setMetricsReportingSettingVisibility_: function(visible) {
       if (visible)
         $('metricsReportingSetting').style.display = 'block';
       else
         $('metricsReportingSetting').style.display = 'none';
     },
 
     /**
+     * Set visibility of network prediction controls based on current connection
+     * type.
+     *
+     * @param {Object} pref Information about network connection.
+     * @param {boolean} pref.onCellularNetwork True if current network
+     * connection is cellular.
+     * @private
+     */
+    setNetworkPredictionVisibility_: function(pref) {
+      if (pref.onCellularNetwork) {
+        $('networkPredictionOptionsBoolDiv').hidden = true;
+        $('networkPredictionOptionsTristateDiv').hidden = false;
+      } else {
+        $('networkPredictionOptionsBoolDiv').hidden = false;
+        $('networkPredictionOptionsTristateDiv').hidden = true;
+      }
+    },
+
+    /**
+     * Set network prediction controls.  There is a checkbox and a dropdown
+     * menu, exactly one of which is visible.
+     *
+     * @param {Object} pref Information about network prediction options.
+     * @param {number} pref.value The value of network prediction options.
+     * @param {boolean} pref.disabled If the pref is not user modifiable.
+     * @private
+     */
+    setNetworkPredictionValue_: function(pref) {
+      var checkbox = $('networkPredictionOptionsBool');
+      checkbox.disabled = pref.disabled;
+      checkbox.checked = !(pref.value == NetworkPredictionOptions.NEVER);
+      var dropdown = $('networkPredictionOptionsTristate');
+      dropdown.disabled = pref.disabled;
+      dropdown.value = pref.value;
+    },
+
+    /**
      * Set the font size selected item. This item actually reflects two
      * preferences: the default font size and the default fixed font size.
      *
      * @param {Object} pref Information about the font size preferences.
      * @param {number} pref.value The value of the default font size pref.
      * @param {boolean} pref.disabled True if either pref not user modifiable.
      * @param {string} pref.controlledBy The source of the pref value(s) if
      *     either pref is currently not controlled by the user.
      * @private
      */
@@ skipping 362 matching lines @@
     'notifyInitializationComplete',
     'removeBluetoothDevice',
     'scrollToSection',
     'setAccountPictureManaged',
     'setWallpaperManaged',
     'setAutoOpenFileTypesDisplayed',
     'setBluetoothState',
     'setCanSetTime',
     'setFontSize',
     'setNativeThemeButtonEnabled',
+    'setNetworkPredictionValue',
+    'setNetworkPredictionVisibility',

[stevenjb, 2014/07/30 18:03:29]

Do we really need two API calls for this? It looks like we always call both?

[Bence, 2014/08/01 14:36:46]

Moot: one function is removed as the result of UI review.  FYI
setNetworkPredictionVisibility was only called when the Settings page was
displayed, setNetworkPredictionValue is called upon every value change.

     'setHighContrastCheckboxState',
     'setMetricsReportingCheckboxState',
     'setMetricsReportingSettingVisibility',
     'setProfilesInfo',
     'setSpokenFeedbackCheckboxState',
     'setThemesResetButtonEnabled',
     'setVirtualKeyboardCheckboxState',
     'setupPageZoomSelector',
     'setupProxySettingsButton',
     'showBluetoothSettings',
@@ skipping 30 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });