Refactoring bluetooth API code.

chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.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/options/chromeos/bluetooth_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_dbus.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_device_dbus.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // |UpdateDeviceCallback| takes a variable length list as an argument. The
 // value stored in each list element is indicated by the following constants.
@@ skipping 90 matching lines @@
     { "bluetoothDisconnectFailed",
         IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT_FAILED },
     { "bluetoothForgetFailed",
         IDS_OPTIONS_SETTINGS_BLUETOOTH_FORGET_FAILED }};
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
 }
 
 // TODO(kevers): Reorder methods to match ordering in the header file.
 
-void BluetoothOptionsHandler::AdapterPresentChanged(BluetoothAdapter* adapter,
-                                                    bool present) {
+void BluetoothOptionsHandler::AdapterPresentChanged(
+    BluetoothAdapter* adapter, bool present) {
   DCHECK(adapter == adapter_.get());
   if (present) {
     web_ui()->CallJavascriptFunction(
         "options.BrowserOptions.showBluetoothSettings");
 
     // Update the checkbox and visibility based on the powered state of the
     // new adapter.
     AdapterPoweredChanged(adapter_.get(), adapter_->IsPowered());
   } else {
     web_ui()->CallJavascriptFunction(
         "options.BrowserOptions.hideBluetoothSettings");
   }
 }
 
-void BluetoothOptionsHandler::AdapterPoweredChanged(BluetoothAdapter* adapter,
-                                                    bool powered) {
+void BluetoothOptionsHandler::AdapterPoweredChanged(
+    BluetoothAdapter* adapter, bool powered) {
   DCHECK(adapter == adapter_.get());
   base::FundamentalValue checked(powered);
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.setBluetoothState", checked);
 }
 
+void BluetoothOptionsHandler::AdapterDiscoveringChanged(
+    BluetoothAdapter* adapter, bool discovering) {
+}
+

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

Why has this empty method been added?

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

Removed.

 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::InitializeHandler() {
-  adapter_ = BluetoothAdapter::DefaultAdapter();
+  adapter_ = BluetoothAdapterDBus::DefaultAdapter();
   adapter_->AddObserver(this);
 }
 
 void BluetoothOptionsHandler::InitializePage() {
   // Show or hide the bluetooth settings and update the checkbox based
   // on the current present/powered state.
   AdapterPresentChanged(adapter_.get(), adapter_->IsPresent());
   // Automatically start device discovery if the "Add Bluetooth Device"
   // overlay is visible.
   web_ui()->CallJavascriptFunction(
@@ skipping 28 matching lines @@
 void BluetoothOptionsHandler::FindDevicesError() {
   DVLOG(1) << "Failed to start discovery.";
   ReportError("bluetoothStartDiscoveryFailed", std::string());
 }
 
 void BluetoothOptionsHandler::UpdateDeviceCallback(
     const ListValue* args) {
   std::string address;
   args->GetString(kUpdateDeviceAddressIndex, &address);
 
-  BluetoothDevice* device = adapter_->GetDevice(address);
+  BluetoothDeviceDBus* device = static_cast<BluetoothDeviceDBus *>(
+      adapter_->GetDevice(address));

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

Why does this need a static_cast?
This interface needs fixing so this is not necessary!

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

Done.

   if (!device)
     return;
 
   std::string command;
   args->GetString(kUpdateDeviceCommandIndex, &command);
 
   if (command == kConnectCommand) {
     int size = args->GetSize();
     if (size > kUpdateDeviceAuthTokenIndex) {
       // PIN code or Passkey entry during the pairing process.
@@ skipping 95 matching lines @@
 void BluetoothOptionsHandler::GetPairedDevicesCallback(
     const ListValue* args) {
   BluetoothAdapter::DeviceList devices = adapter_->GetDevices();
 
   for (BluetoothAdapter::DeviceList::iterator iter = devices.begin();
        iter != devices.end(); ++iter)
     SendDeviceNotification(*iter, NULL);
 }
 
 void BluetoothOptionsHandler::SendDeviceNotification(
-    const BluetoothDevice* device,
-    base::DictionaryValue* params) {
+    const BluetoothDevice* device, base::DictionaryValue* params) {
   base::DictionaryValue js_properties;
   js_properties.SetString("name", device->GetName());
   js_properties.SetString("address", device->address());
   js_properties.SetBoolean("paired", device->IsPaired());
   js_properties.SetBoolean("bonded", device->IsBonded());
   js_properties.SetBoolean("connected", device->IsConnected());
   if (params) {
     js_properties.MergeDictionary(params);
   }
   web_ui()->CallJavascriptFunction(
@@ skipping 73 matching lines @@
   DCHECK(device);
 
   base::StringValue address(device->address());
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.removeBluetoothDevice",
       address);
 }
 
 }  // namespace options
 }  // namespace chromeos