chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc - Issue 180163009: chrome.bluetooth API improvements.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

Issue 180163009: chrome.bluetooth API improvements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix threading ownership related to ApiResourceManager<BluetoothApiSocket> and BluetoothSocketEventD… Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | chrome/common/extensions/api/bluetooth.idl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

index c0791272f0ee6bc252bc986ccb3b6d047f47c4c7..a0174c46985d2009bf4744249dbc3100179a7613 100644

--- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

@@ -397,12 +397,15 @@ void BluetoothOptionsHandler::ConnectError(

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) {

VLOG(1) << "Failed to disconnect and unpair device: " << address;

ReportError("bluetoothForgetFailed", address);

}