Add bluetooth callbacks for fetching paired devices and stopping device discovery.

chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 146 matching lines @@
 void BluetoothOptionsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("bluetoothEnableChange",
       base::Bind(&BluetoothOptionsHandler::EnableChangeCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("findBluetoothDevices",
       base::Bind(&BluetoothOptionsHandler::FindDevicesCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("updateBluetoothDevice",
       base::Bind(&BluetoothOptionsHandler::UpdateDeviceCallback,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("stopBluetoothDeviceDiscovery",
+      base::Bind(&BluetoothOptionsHandler::StopDiscoveryCallback,
+                 base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("getPairedBluetoothDevices",
+      base::Bind(&BluetoothOptionsHandler::GetPairedDevicesCallback,
+                 base::Unretained(this)));
+
 }
 
 void BluetoothOptionsHandler::EnableChangeCallback(
     const ListValue* args) {
   bool bluetooth_enabled;
   args->GetBoolean(0, &bluetooth_enabled);
   // TODO(kevers): Call Bluetooth API to enable or disable.
   base::FundamentalValue checked(bluetooth_enabled);
   web_ui()->CallJavascriptFunction(
       "options.AdvancedOptions.setBluetoothState", checked);
@@ skipping 38 matching lines @@
     std::string passkey;
     args->GetString(kUpdateDevicePasskeyIndex, &passkey);
     DVLOG(1) << "UpdateDeviceCallback: " << address << ": " << command
             << " [" << passkey << "]";
   } else {
     // Initiating a device connection or disconnecting
     DVLOG(1) << "UpdateDeviceCallback: " << address << ": " << command;
   }
 }
 
+void BluetoothOptionsHandler::StopDiscoveryCallback(
+    const ListValue* args) {
+ DVLOG(2) << "Stop searching for Bluetooth devices";

[James Hawkins, 2012/01/31 18:14:27]

Did you intend to leave these logging statements in?  If so, you should
standardize on one style (DVLOG(2) vs VLOG(1) etc).

[kevers, 2012/01/31 18:20:31]

Intend to pull most of the logging out.  I should probably log a separate CL for
the logging.

+ chromeos::BluetoothManager* bluetooth_manager =
+      chromeos::BluetoothManager::GetInstance();
+  DCHECK(bluetooth_manager);
+
+  chromeos::BluetoothAdapter* default_adapter =
+      bluetooth_manager->DefaultAdapter();
+
+  ValidateDefaultAdapter(default_adapter);
+
+  if (default_adapter == NULL) {
+    VLOG(1) << "DiscoveryEnded: no default adapter";
+    return;
+  }
+
+  default_adapter->StopDiscovery();
+}
+
+void BluetoothOptionsHandler::GetPairedDevicesCallback(
+    const ListValue* args) {
+  // TODO(keybuk): Iterate over list of paired devices calling
+  // SetDeviceNotification for each device.
+  DVLOG(2) << "Get paired Bluetooth devices";
+}
+
 void BluetoothOptionsHandler::SendDeviceNotification(
     chromeos::BluetoothDevice* device,
     base::DictionaryValue* params) {
   // Retrieve properties of the bluetooth device.  The properties names are
   // in title case.  Convert to camel case in accordance with our Javascript
   // naming convention.
   const DictionaryValue& properties = device->AsDictionary();
   base::DictionaryValue js_properties;
   for (DictionaryValue::key_iterator it = properties.begin_keys();
       it != properties.end_keys(); ++it) {
@@ skipping 85 matching lines @@
 
   // TODO(vlaviano): Respond to adapter change.
 }
 
 void BluetoothOptionsHandler::DiscoveryStarted(const std::string& adapter_id) {
   VLOG(2) << "Discovery started on " << adapter_id;
 }
 
 void BluetoothOptionsHandler::DiscoveryEnded(const std::string& adapter_id) {
   VLOG(2) << "Discovery ended on " << adapter_id;
-
-  // Stop the discovery session.
-  // TODO(vlaviano): We may want to expose DeviceDisappeared, remove the
-  // "Find devices" button, and let the discovery session continue throughout
-  // the time that the page is visible rather than just doing a single discovery
-  // cycle in response to a button click.
-  chromeos::BluetoothManager* bluetooth_manager =
-      chromeos::BluetoothManager::GetInstance();
-  DCHECK(bluetooth_manager);
-
-  chromeos::BluetoothAdapter* default_adapter =
-      bluetooth_manager->DefaultAdapter();
-
-  ValidateDefaultAdapter(default_adapter);
-
-  if (default_adapter == NULL) {
-    VLOG(1) << "DiscoveryEnded: no default adapter";
-    return;
-  }
-
-  default_adapter->StopDiscovery();
 }
 
 void BluetoothOptionsHandler::DeviceFound(const std::string& adapter_id,
                                           chromeos::BluetoothDevice* device) {
   VLOG(2) << "Device found on " << adapter_id;
   DCHECK(device);
   SendDeviceNotification(device, NULL);
 }
 
 void BluetoothOptionsHandler::ValidateDefaultAdapter(
@@ skipping 57 matching lines @@
     // Sending an error notification.
     DictionaryValue params;
     params.SetString("pairing", pairing);
     SendDeviceNotification(device, &params);
   }
   delete device;
 }
 
 }  // namespace options2
 }  // namespace chromeos