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

Side by Side 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 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 unified diff | 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')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"	5 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/callback.h"	9 #include "base/callback.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 { "bluetoothConnectAuthFailed",	84 { "bluetoothConnectAuthFailed",

85 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_FAILED },	85 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_FAILED },

86 { "bluetoothConnectAuthCanceled",	86 { "bluetoothConnectAuthCanceled",

87 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_CANCELED },	87 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_CANCELED },

88 { "bluetoothConnectAuthRejected",	88 { "bluetoothConnectAuthRejected",

89 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_REJECTED },	89 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_REJECTED },

90 { "bluetoothConnectAuthTimeout",	90 { "bluetoothConnectAuthTimeout",

91 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_TIMEOUT },	91 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_AUTH_TIMEOUT },

92 { "bluetoothConnectUnsupportedDevice",	92 { "bluetoothConnectUnsupportedDevice",

93 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_UNSUPPORTED_DEVICE },	93 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_UNSUPPORTED_DEVICE },

	94 { "bluetoothConnectAttributeLengthInvalid",

	95 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_ATTRIBUTE_LENGTH_INVALID },

	96 { "bluetoothConnectConnectionCongested",

	97 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_CONNECTION_CONGESTED },

	98 { "bluetoothConnectInsufficientEncryption",

	99 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_INSUFFICIENT_ENCRYPTION },

	100 { "bluetoothConnectOffsetInvalid",

	101 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_OFFSET_INVALID },

	102 { "bluetoothConnectReadFailed",
	scheib 2015/11/26 00:02:51 Enum and string should use 'permitted' instead of Enum and string should use 'permitted' instead of 'failed'.
	103 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_READ_FAILED },

	104 { "bluetoothConnectRequestNotSupported",

	105 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_REQUEST_NOT_SUPPORTED },

	106 { "bluetoothConnectWriteFailed",
	scheib 2015/11/26 00:02:51 Enum and string should use 'permitted' instead of Enum and string should use 'permitted' instead of 'failed'. Kai Jiang 2015/11/29 10:40:51 Done. Show quoted text On 2015/11/26 00:02:51, scheib wrote: > Enum and string should use 'permitted' instead of 'failed'. Done.
	107 IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT_WRITE_FAILED },

94 { "bluetoothDisconnectFailed",	108 { "bluetoothDisconnectFailed",

95 IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT_FAILED },	109 IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT_FAILED },

96 { "bluetoothForgetFailed",	110 { "bluetoothForgetFailed",

97 IDS_OPTIONS_SETTINGS_BLUETOOTH_FORGET_FAILED }};	111 IDS_OPTIONS_SETTINGS_BLUETOOTH_FORGET_FAILED }};

98	112

99 RegisterStrings(localized_strings, resources, arraysize(resources));	113 RegisterStrings(localized_strings, resources, arraysize(resources));

100 }	114 }

101	115

102 } // namespace options	116 } // namespace options

103 } // namespace chromeos	117 } // namespace chromeos

OLD	NEW