Fix the bluetooth 'add device' button for CrOS.

chrome/browser/resources/options2/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;
 
   //
@@ skipping 255 matching lines @@
           chrome.send('metricsReportingCheckboxAction',
               [String(event.target.checked)]);
         };
       }
 
       // Bluetooth (CrOS only).
       if (cr.isChromeOS) {
         options.system.bluetooth.BluetoothDeviceList.decorate(
             $('bluetooth-paired-devices-list'));
 
-        $('bluetooth-add-device').onclick = function(event) {
-          this.findBluetoothDevices_(true);
-          OptionsPage.navigateToPage('bluetooth');
-        };
+        $('bluetooth-add-device').onclick =
+            this.handleAddBluetoothDevice_.bind(this);
 
         $('enable-bluetooth').onchange = function(event) {
           var state = $('enable-bluetooth').checked;
           chrome.send('bluetoothEnableChange', [Boolean(state)]);
         };
 
         $('bluetooth-reconnect-device').onclick = function(event) {
           var device = $('bluetooth-paired-devices-list').selectedItem;
           var address = device.address;
           chrome.send('updateBluetoothDevice', [address, 'connect']);
@@ skipping 184 matching lines @@
           $('advanced-settings-container').offsetHeight + 20 + 'px';
       $('advanced-settings-expander').innerHTML =
           localStrings.getString('hideAdvancedSettings');
     },
 
     /**
      * Hide advanced settings.
      * @private
      */
     hideAdvancedSettings_: function() {
-      $('advanced-settings').style.height = '0px'
+      $('advanced-settings').style.height = '0px';
       $('advanced-settings-expander').innerHTML =
           localStrings.getString('showAdvancedSettings');
     },
 
     /**
      * Updates managed banner visibility state. This function iterates over
      * all input fields of all subpages and if any of these is marked as managed
      * it triggers the managed banner to be visible.
      * @private
      */
@@ skipping 453 matching lines @@
      */
     updateAccountPicture_: function() {
       var picture = $('account-picture');
       if (picture) {
         picture.src = 'chrome://userimage/' + this.username_ + '?id=' +
             Date.now();
       }
     },
 
     /**
-     * Scan for bluetooth devices.
-     * @param {boolean} reset Indicates if the list of unpaired devices should
-     *     be cleared.
+     * Handle the 'add device' button click.
      * @private
      */
-    findBluetoothDevices_: function(reset) {
+    handleAddBluetoothDevice_: function() {
       $('bluetooth-unpaired-devices-list').clear();
       chrome.send('findBluetoothDevices');
+      OptionsPage.navigateToPage('bluetooth');
     },
 
     /**
      * Set the checked state of the metrics reporting checkbox.
      * @private
      */
     setMetricsReportingCheckboxState_: function(checked, disabled) {
       $('metricsReportingEnabled').checked = checked;
       $('metricsReportingEnabled').disabled = disabled;
       if (disabled)
@@ skipping 284 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });