chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js - Issue 9694054: bluetooth: implement device pairing support

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/resources/options2/chromeos/bluetooth_pair_device_overlay.js

Issue 9694054: bluetooth: implement device pairing support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: [clang] use POD for constants to avoid exit-time destructor error Created 8 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

« chrome/browser/chromeos/bluetooth/bluetooth_device.cc ('K') | « chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.h ('k') | chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js

diff --git a/chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js b/chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js

index ca455d184ad1f9bf61621b0da12e84500ea7502b..f1590ac1984e2119a28bfcb10bda15aa7e44055a 100644

--- a/chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js

+++ b/chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js

@@ -72,12 +72,17 @@ cr.define('options', function() {

initializePage: function() {

OptionsPage.prototype.initializePage.call(this);

var self = this;

- var cancel = function() {

+ $('bluetooth-pair-device-cancel-button').onclick = function() {

chrome.send('updateBluetoothDevice',

[self.device_.address, 'cancel']);

OptionsPage.closeOverlay();

};

- var connect = function() {

+ $('bluetooth-pair-device-reject-button').onclick = function() {

+ chrome.send('updateBluetoothDevice',

+ [self.device_.address, 'reject']);

+ OptionsPage.closeOverlay();

+ };

+ $('bluetooth-pair-device-connect-button').onclick = function() {

var args = [self.device_.address, 'connect'];

var passkey = self.device_.passkey;

if (!passkey && !$('bluetooth-pairing-passkey-entry').hidden)

@@ -87,10 +92,11 @@ cr.define('options', function() {

chrome.send('updateBluetoothDevice', args);

OptionsPage.closeOverlay();

};

- $('bluetooth-pair-device-cancel-button').onclick = cancel;

- $('bluetooth-pair-device-reject-button').onclick = cancel;

- $('bluetooth-pair-device-connect-button').onclick = connect;

- $('bluetooth-pair-device-accept-button').onclick = connect;

+ $('bluetooth-pair-device-accept-button').onclick = function() {

+ chrome.send('updateBluetoothDevice',

+ [self.device_.address, 'accept']);

+ OptionsPage.closeOverlay();

+ };

$('bluetooth-pair-device-dismiss-button').onclick = function() {

OptionsPage.closeOverlay();

};