chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc - Issue 1464443002: bluetooth: android: Add BluetoothDevice::ConnectErrorCode enums

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 1464443002: bluetooth: android: Add BluetoothDevice::ConnectErrorCode enums (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: III Created 5 years, 1 month 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

« chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js ('K') | « chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js ('k') | content/browser/bluetooth/bluetooth_dispatcher_host.cc » ('j') | content/browser/bluetooth/bluetooth_dispatcher_host.cc » ('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 1defd65bb916c533d3b7827c563eec866eb012c3..f4a7a7196bffab390d8df82ac2e1585605fd9c92 100644

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

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

@@ -91,6 +91,20 @@ void BluetoothOptionsHandler::GetLocalizedValues(

IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_TIMEOUT },

{ "bluetoothConnectUnsupportedDevice",

IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_UNSUPPORTED_DEVICE },

+ { "bluetoothConnectAttributeLengthInvalid",

+ IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_ATTRIBUTE_LENGTH_INVALID },

+ { "bluetoothConnectConnectionCongested",

+ IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_CONNECTION_CONGESTED },

+ { "bluetoothConnectInsufficientEncryption",

+ IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_INSUFFICIENT_ENCRYPTION },

+ { "bluetoothConnectOffsetInvalid",

+ IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_OFFSET_INVALID },

+ { "bluetoothConnectReadFailed",

scheib 2015/11/26 00:02:51 Enum and string should use 'permitted' instead of

+ IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_READ_FAILED },

+ { "bluetoothConnectRequestNotSupported",

+ IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_REQUEST_NOT_SUPPORTED },

+ { "bluetoothConnectWriteFailed",

scheib 2015/11/26 00:02:51 Enum and string should use 'permitted' instead of

Kai Jiang 2015/11/29 10:40:51 Done.

+ IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_WRITE_FAILED },

{ "bluetoothDisconnectFailed",

IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT_FAILED },

{ "bluetoothForgetFailed",