Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h

Issue 13870020: Bluetooth: Add support for pairing display notifications (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: nits Created 7 years, 8 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 unified diff | Download patch
OLDNEW
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 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // instructions. 89 // instructions.
90 // 90 //
91 // This is used for Bluetooth 2.1 and later devices that support input 91 // This is used for Bluetooth 2.1 and later devices that support input
92 // but not display, such as keyboards. The Passkey is a numeric in the 92 // but not display, such as keyboards. The Passkey is a numeric in the
93 // range 0-999999 and should be always presented zero-padded to six 93 // range 0-999999 and should be always presented zero-padded to six
94 // digits. 94 // digits.
95 virtual void DisplayPasskey( 95 virtual void DisplayPasskey(
96 device::BluetoothDevice* device, uint32 passkey) OVERRIDE; 96 device::BluetoothDevice* device, uint32 passkey) OVERRIDE;
97 97
98 // device::BluetoothDevice::PairingDelegate override. 98 // device::BluetoothDevice::PairingDelegate override.
99
keybuk 2013/04/18 00:30:13 missing //
100 // This method will be called when the Bluetooth daemon gets a notification
101 // of a key entered in the device |device| while pairing with the device
keybuk 2013/04/18 00:30:13 make the same text fixes here that were made on th
102 // using a PIN code or a Passkey.
103 // The UI will show a visual indication that a given key was pressed in the
104 // same pairing overlay where the PIN code or Passkey is displayed.
105 //
106 // A first call with |entered| as 0 will indicate that this notification
107 // mechanism is supported by the device allowing the UI to display this fact.
108 virtual void DisplayEnteredKeys(device::BluetoothDevice* device,
109 uint32 entered) OVERRIDE;
110
111 // device::BluetoothDevice::PairingDelegate override.
99 // 112 //
100 // This method will be called when the Bluetooth daemon requires that the 113 // This method will be called when the Bluetooth daemon requires that the
101 // user confirm that the Passkey |passkey| is displayed on the screen 114 // user confirm that the Passkey |passkey| is displayed on the screen
102 // of the device |device| so that it may be authenticated, the UI will 115 // of the device |device| so that it may be authenticated, the UI will
103 // display the passkey with accompanying instructions. 116 // display the passkey with accompanying instructions.
104 // 117 //
105 // This is used for Bluetooth 2.1 and later devices that support display, 118 // This is used for Bluetooth 2.1 and later devices that support display,
106 // such as other computers or phones. The Passkey is a numeric in the 119 // such as other computers or phones. The Passkey is a numeric in the
107 // range 0-999999 and should be always present zero-padded to six 120 // range 0-999999 and should be always present zero-padded to six
108 // digits. 121 // digits.
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 // than this object does. 214 // than this object does.
202 base::WeakPtrFactory<BluetoothOptionsHandler> weak_ptr_factory_; 215 base::WeakPtrFactory<BluetoothOptionsHandler> weak_ptr_factory_;
203 216
204 DISALLOW_COPY_AND_ASSIGN(BluetoothOptionsHandler); 217 DISALLOW_COPY_AND_ASSIGN(BluetoothOptionsHandler);
205 }; 218 };
206 219
207 } // namespace options 220 } // namespace options
208 } // namespace chromeos 221 } // namespace chromeos
209 222
210 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_ 223 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698