chrome.bluetooth API improvements.

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"
@@ skipping 379 matching lines @@
       break;
     case device::BluetoothDevice::ERROR_UNSUPPORTED_DEVICE:
       error_name = "bluetoothConnectUnsupportedDevice";
       break;
   }
   // Report an error only if there's an error to report.
   if (error_name)
     ReportError(error_name, address);
 }
 
-void BluetoothOptionsHandler::DisconnectError(const std::string& address) {
+void BluetoothOptionsHandler::DisconnectError(
+    const std::string& address,
+    const std::string& error_message) {
   VLOG(1) << "Failed to disconnect from device: " << address;
   ReportError("bluetoothDisconnectFailed", address);
 }
 
-void BluetoothOptionsHandler::ForgetError(const std::string& address) {
+void BluetoothOptionsHandler::ForgetError(const std::string& address,
+                                          const std::string& error_message) {

[keybuk, 2014/03/27 20:20:07]

No error_message parameter

[rpaquay, 2014/03/27 22:00:01]

Done.

   VLOG(1) << "Failed to disconnect and unpair device: " << address;
   ReportError("bluetoothForgetFailed", address);
 }
 
 void BluetoothOptionsHandler::StopDiscoveryCallback(
     const base::ListValue* args) {
   should_run_device_discovery_ = false;
   if (!discovery_session_.get() || !discovery_session_->IsActive()) {
     VLOG(1) << "No active discovery session.";
     return;
@@ skipping 160 matching lines @@
 void BluetoothOptionsHandler::DeviceConnecting(
     device::BluetoothDevice* device) {
   DCHECK(device);
   base::DictionaryValue params;
   params.SetString("pairing", kStartConnecting);
   SendDeviceNotification(device, &params);
 }
 
 }  // namespace options
 }  // namespace chromeos