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

Unified Diff: chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js

Issue 410293004: Split OptionsPage into Page and PageManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed feedback Created 6 years, 5 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
Index: chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js
diff --git a/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js b/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js
index acaa0afab393d22541442730740d2e92261535b3..8c123dbd527c36acd98433d6184b49ad52a73063 100644
--- a/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js
+++ b/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js
@@ -3,7 +3,8 @@
// found in the LICENSE file.
cr.define('options', function() {
- /** @const */ var OptionsPage = options.OptionsPage;
+ /** @const */ var Page = cr.ui.pageManager.Page;
+ /** @const */ var PageManager = cr.ui.pageManager.PageManager;
/**
* Enumeration of possible states during pairing. The value associated with
@@ -43,16 +44,16 @@ cr.define('options', function() {
* @constructor
*/
function BluetoothPairing() {
- OptionsPage.call(this,
- 'bluetoothPairing',
- loadTimeData.getString('bluetoothOptionsPageTabTitle'),
- 'bluetooth-pairing');
+ Page.call(this,
+ 'bluetoothPairing',
+ loadTimeData.getString('bluetoothOptionsPageTabTitle'),
+ 'bluetooth-pairing');
}
cr.addSingletonGetter(BluetoothPairing);
BluetoothPairing.prototype = {
- __proto__: OptionsPage.prototype,
+ __proto__: Page.prototype,
/**
* Description of the bluetooth device.
@@ -78,16 +79,16 @@ cr.define('options', function() {
/** @override */
initializePage: function() {
- OptionsPage.prototype.initializePage.call(this);
+ Page.prototype.initializePage.call(this);
var self = this;
$('bluetooth-pair-device-cancel-button').onclick = function() {
- OptionsPage.closeOverlay();
+ PageManager.closeOverlay();
};
$('bluetooth-pair-device-reject-button').onclick = function() {
chrome.send('updateBluetoothDevice',
[self.device_.address, 'reject']);
self.device_.pairing = PAIRING.DISMISSED;
- OptionsPage.closeOverlay();
+ PageManager.closeOverlay();
};
$('bluetooth-pair-device-connect-button').onclick = function() {
var args = [self.device_.address, 'connect'];
@@ -109,7 +110,7 @@ cr.define('options', function() {
$('bluetooth-pair-device-accept-button').disabled = true;
};
$('bluetooth-pair-device-dismiss-button').onclick = function() {
- OptionsPage.closeOverlay();
+ PageManager.closeOverlay();
};
$('bluetooth-passkey').oninput = function() {
var inputField = $('bluetooth-passkey');
@@ -325,7 +326,7 @@ cr.define('options', function() {
*/
BluetoothPairing.showDialog = function(device) {
BluetoothPairing.getInstance().update(device);
- OptionsPage.showPageByName('bluetoothPairing', false);
+ PageManager.showPageByName('bluetoothPairing', false);
};
/**
@@ -367,11 +368,11 @@ cr.define('options', function() {
* Closes the Bluetooth pairing dialog.
*/
BluetoothPairing.dismissDialog = function() {
- var overlay = OptionsPage.getTopmostVisiblePage();
+ var overlay = PageManager.getTopmostVisiblePage();
var dialog = BluetoothPairing.getInstance();
if (overlay == dialog && dialog.dismissible_) {
dialog.device_.pairing = PAIRING.DISMISSED;
- OptionsPage.closeOverlay();
+ PageManager.closeOverlay();
}
};

Powered by Google App Engine
This is Rietveld 408576698