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

Unified Diff: chrome/browser/resources/bluetooth_internals/bluetooth_internals.js

Issue 2567983007: bluetooth: Add adapter page to internals page. (Closed)
Patch Set: Merge upstream Created 3 years, 11 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/bluetooth_internals/bluetooth_internals.js
diff --git a/chrome/browser/resources/bluetooth_internals/bluetooth_internals.js b/chrome/browser/resources/bluetooth_internals/bluetooth_internals.js
index 00a9d0eb44091ee5a555dab85d388006522a8269..9f1c578f878d9ab392bb5215378309d1d0b4be4b 100644
--- a/chrome/browser/resources/bluetooth_internals/bluetooth_internals.js
+++ b/chrome/browser/resources/bluetooth_internals/bluetooth_internals.js
@@ -13,6 +13,7 @@ var devices = null;
var sidebarObj = null;
cr.define('bluetooth_internals', function() {
+ /** @const */ var AdapterPage = adapter_page.AdapterPage;
/** @const */ var DevicesPage = devices_page.DevicesPage;
/** @const */ var PageManager = cr.ui.pageManager.PageManager;
/** @const */ var Snackbar = snackbar.Snackbar;
@@ -47,6 +48,8 @@ cr.define('bluetooth_internals', function() {
/** @type {!device_collection.DeviceCollection} */
devices = new device_collection.DeviceCollection([]);
+ /** @type {adapter_page.AdapterPage} */
+ var adapterPage = null;
/** @type {devices_page.DevicesPage} */
var devicesPage = null;
@@ -121,9 +124,11 @@ cr.define('bluetooth_internals', function() {
}
function setupAdapterSystem(response) {
- console.log('adapter', response.info);
-
adapterBroker.addEventListener('adapterchanged', function(event) {
+ adapterPage.adapterFieldSet.value[event.detail.property] =
+ event.detail.value;
+ adapterPage.redraw();
+
if (event.detail.property == adapter_broker.AdapterProperty.DISCOVERING &&
!event.detail.value && !userRequestedScanStop && discoverySession) {
updateStoppedDiscoverySession();
@@ -131,6 +136,14 @@ cr.define('bluetooth_internals', function() {
'Discovery session ended unexpectedly', SnackbarType.WARNING);
}
});
+
+ adapterPage.setAdapterInfo(response.info);
+
+ adapterPage.pageDiv.addEventListener('refreshpressed', function() {
+ adapterBroker.getInfo().then(function(response) {
+ adapterPage.setAdapterInfo(response.info);
+ });
+ });
}
function setupDeviceSystem(response) {
@@ -197,6 +210,8 @@ cr.define('bluetooth_internals', function() {
devicesPage = new DevicesPage();
PageManager.register(devicesPage);
+ adapterPage = new AdapterPage();
+ PageManager.register(adapterPage);
// Set up hash-based navigation.
window.addEventListener('hashchange', function() {
@@ -204,7 +219,7 @@ cr.define('bluetooth_internals', function() {
});
if (!window.location.hash) {
- PageManager.showPageByName(devicesPage.name);
+ PageManager.showPageByName(adapterPage.name);
return;
}

Powered by Google App Engine
This is Rietveld 408576698