Refactoring bluetooth API code.

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/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 namespace options {
@@ skipping 58 matching lines @@
   //
   // This method will be called when the Bluetooth daemon requires that the
   // user enter the Passkey |passkey| into the device |device| so that it
   // may be authenticated, the UI will display the passkey with accompanying
   // instructions.
   //
   // This is used for Bluetooth 2.1 and later devices that support input
   // 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.
   //
   // This method will be called when the Bluetooth daemon requires that the
   // user confirm that the Passkey |passkey| is displayed on the screen
   // of the device |device| so that it may be authenticated, the UI will
   // display the passkey with accompanying instructions.
   //
   // This is used for Bluetooth 2.1 and later devices that support display,
   // 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.
   //
   // This method will be called when any previous DisplayPinCode(),
   // DisplayPasskey() or ConfirmPasskey() request should be concluded
   // and removed from the user.
   virtual void DismissDisplayOrConfirm() OVERRIDE;
 
   // Displays a Bluetooth error.
   // |error| maps to a localized resource for the error message.
   // |address| is the address of the Bluetooth device.  May be an empty
   // string if the error is not specific to a single device.
   void ReportError(const std::string& error, const std::string& address);
 
   // BluetoothAdapter::Observer implementation.
   virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
                                      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,
                              BluetoothDevice* device) OVERRIDE;
   virtual void DeviceRemoved(BluetoothAdapter* adapter,
                              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.
   // |args| will contain the checkbox checked state as a string
   // ("true" or "false").
   void EnableChangeCallback(const base::ListValue* args);
 
   // Called when the 'Find Devices' button is pressed from the Bluetooth
   // ssettings.
   // |args| will be an empty list.
@@ skipping 23 matching lines @@
   // 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_