Refactoring bluetooth API code.

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

Index: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h
diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h
index f27d4c4537ce0863107e8f01e32056b81cf920d1..281c332994457bab09d3330b5ca4f1802bbb6b8f 100644
--- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h
@@ -10,6 +10,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
@@ -88,8 +89,7 @@ class BluetoothOptionsHandler : public ::options::OptionsPageUIHandler,
   // but not display, such as keyboards. The Passkey is a numeric in the
   // range 0-999999 and should be always presented zero-padded to six
   // digits.
-  virtual void DisplayPasskey(BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
+  virtual void DisplayPasskey(BluetoothDevice* device, uint32 passkey) OVERRIDE;
 
   // BluetoothDevice::PairingDelegate override.
   //
@@ -102,8 +102,7 @@ class BluetoothOptionsHandler : public ::options::OptionsPageUIHandler,
   // such as other computers or phones. The Passkey is a numeric in the
   // range 0-999999 and should be always present zero-padded to six
   // digits.
-  virtual void ConfirmPasskey(BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
+  virtual void ConfirmPasskey(BluetoothDevice* device, uint32 passkey) OVERRIDE;
 
   // BluetoothDevice::PairingDelegate override.
   //
@@ -123,6 +122,8 @@ class BluetoothOptionsHandler : public ::options::OptionsPageUIHandler,
                                      bool present) OVERRIDE;
   virtual void AdapterPoweredChanged(BluetoothAdapter* adapter,
                                      bool powered) OVERRIDE;
+  virtual void AdapterDiscoveringChanged(BluetoothAdapter* adapter,
+                                         bool discovering) OVERRIDE;

[keybuk, 2012/09/13 23:57:30]

Why has this been added?

[youngki, 2012/09/17 21:53:02]

I added it when Observer was pure virtual; now I removed it after turning it
into empty implementation.

   virtual void DeviceAdded(BluetoothAdapter* adapter,
                            BluetoothDevice* device) OVERRIDE;
   virtual void DeviceChanged(BluetoothAdapter* adapter,
@@ -131,28 +132,28 @@ class BluetoothOptionsHandler : public ::options::OptionsPageUIHandler,
                              BluetoothDevice* device) OVERRIDE;
 
  private:
-  // Called by BluetoothAdapter in response to a failure to change the
-  // power status of the adapter.
+  // Called by BluetoothAdapter in response to a failure to change the power
+  // status of the adapter.
   void EnableChangeError();
 
-  // Called by BluetoothAdapter in response to a failure to set the adapter
-  // into discovery mode.
+  // Called by BluetoothAdapter in response to a failure to set the adapter into
+  // discovery mode.
   void FindDevicesError();
 
   // Called by BluetoothAdapter in response to a failure to remove the adapter
   // from discovery mode.
   void StopDiscoveryError();
 
-  // Called by BluetoothDevice in response to a failure to connect to the
-  // device with bluetooth address |address|.
+  // Called by BluetoothDevice in response to a failure to connect to the device
+  // with bluetooth address |address|.
   void ConnectError(const std::string& address);
 
-  // Called by BluetoothDevice in response to a failure to disconnect the
-  // device with bluetooth address |address|.
+  // Called by BluetoothDevice in response to a failure to disconnect the device
+  // with bluetooth address |address|.
   void DisconnectError(const std::string& address);
 
-  // Called by BluetoothDevice in response to a failure to disconnect and
-  // unpair the device with bluetooth address |address|.
+  // Called by BluetoothDevice in response to a failure to disconnect and unpair
+  // the device with bluetooth address |address|.
   void ForgetError(const std::string& address);
 
   // Called when the 'Enable bluetooth' checkbox value is changed.