Migrate Chrome OS Bluetooth UI to the new discovery API.

chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_device.h"
+#include "device/bluetooth/bluetooth_discovery_session.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 namespace options {
 
 // Handler for Bluetooth options on the system options page.
 class BluetoothOptionsHandler
@@ skipping 120 matching lines @@
                              device::BluetoothDevice* device) OVERRIDE;
 
  private:
   // Displays in the UI a connecting to the device |device| message.
   void DeviceConnecting(device::BluetoothDevice* device);
 
   // Called by device::BluetoothAdapter in response to a failure to
   // change the power status of the adapter.
   void EnableChangeError();
 
+  // Called by device::BluetoothAdapter in response to a successful request
+  // to initiate a discovery session.
+  void OnStartDiscoverySession(
+      scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
+
   // Called by device::BluetoothAdapter in response to a failure to
-  // set the adapter into discovery mode.
+  // initiate a discovery session.
   void FindDevicesError();
 
   // Called by device::BluetoothAdapter in response to a failure to
-  // remove the adapter from discovery mode.
+  // terminate a discovery session.
   void StopDiscoveryError();
 
   // Called by device::BluetoothDevice on a successful pairing and connection
   // to a device.
   void Connected();
 
   // Called by device::BluetoothDevice in response to a failure to
   // connect to the device with bluetooth address |address| due to an error
   // encoded in |error_code|.
   void ConnectError(const std::string& address,
@@ skipping 30 matching lines @@
   void StopDiscoveryCallback(const base::ListValue* args);
 
   // Called when the list of paired devices is initialized in order to
   // populate the list.
   // |args| will be an empty list.
   void GetPairedDevicesCallback(const base::ListValue* args);
 
   // Default bluetooth adapter, used for all operations.
   scoped_refptr<device::BluetoothAdapter> adapter_;
 
-  // True while performing device discovery.
-  bool discovering_;
+  // The current device discovery session. Only one active discovery session is
+  // kept at a time and the instance that |discovery_session_| points to gets
+  // replaced by a new one when a new discovery session is initiated.
+  scoped_ptr<device::BluetoothDiscoverySession> discovery_session_;
 
   // Cached information about the current pairing device, if any.
   std::string pairing_device_address_;
   std::string pairing_device_pairing_;
   std::string pairing_device_pincode_;
   int pairing_device_passkey_;
   int pairing_device_entered_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than this object does.
   base::WeakPtrFactory<BluetoothOptionsHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothOptionsHandler);
 };
 
 }  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_