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

Side by Side Diff: chrome/browser/resources/options2/chromeos/internet_detail.js

Issue 10174010: Add BSSID, frequency and signal strength to WiFi details. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update grd example to MHz. Insert space before unit. Created 8 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 | Annotate | Revision Log
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 cr.define('options.internet', function() { 5 cr.define('options.internet', function() {
6 var OptionsPage = options.OptionsPage; 6 var OptionsPage = options.OptionsPage;
7 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; 7 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
8 8
9 /* 9 /*
10 * Helper function to set hidden attribute for elements matching a selector. 10 * Helper function to set hidden attribute for elements matching a selector.
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 if (data.type == options.internet.Constants.TYPE_WIFI) { 667 if (data.type == options.internet.Constants.TYPE_WIFI) {
668 OptionsPage.showTab($('wifi-network-nav-tab')); 668 OptionsPage.showTab($('wifi-network-nav-tab'));
669 detailsPage.wireless = true; 669 detailsPage.wireless = true;
670 detailsPage.vpn = false; 670 detailsPage.vpn = false;
671 detailsPage.ethernet = false; 671 detailsPage.ethernet = false;
672 detailsPage.cellular = false; 672 detailsPage.cellular = false;
673 detailsPage.gsm = false; 673 detailsPage.gsm = false;
674 detailsPage.shared = data.shared; 674 detailsPage.shared = data.shared;
675 $('wifi-connection-state').textContent = data.connectionState; 675 $('wifi-connection-state').textContent = data.connectionState;
676 $('wifi-ssid').textContent = data.ssid; 676 $('wifi-ssid').textContent = data.ssid;
677 if (data.bssid && data.bssid.length > 0) {
678 $('wifi-bssid').textContent = data.bssid;
679 $('wifi-bssid-entry').hidden = false;
680 } else {
681 $('wifi-bssid-entry').hidden = true;
682 }
677 $('wifi-ip-address').textContent = inetAddress; 683 $('wifi-ip-address').textContent = inetAddress;
678 $('wifi-subnet-address').textContent = inetSubnetAddress; 684 $('wifi-subnet-address').textContent = inetSubnetAddress;
679 $('wifi-gateway').textContent = inetGateway; 685 $('wifi-gateway').textContent = inetGateway;
680 $('wifi-dns').textContent = inetDns; 686 $('wifi-dns').textContent = inetDns;
681 if (data.encryption && data.encryption.length > 0) { 687 if (data.encryption && data.encryption.length > 0) {
682 $('wifi-security').textContent = data.encryption; 688 $('wifi-security').textContent = data.encryption;
683 $('wifi-security-entry').hidden = false; 689 $('wifi-security-entry').hidden = false;
684 } else { 690 } else {
685 $('wifi-security-entry').hidden = true; 691 $('wifi-security-entry').hidden = true;
686 } 692 }
693 // Frequency is in MHz.
694 var frequency = localStrings.getString('inetFrequencyFormat');
695 frequency = frequency.replace('$1', data.frequency);
696 $('wifi-frequency').textContent = frequency;
697 // Signal strength as percentage.
698 var signalStrength = localStrings.getString('inetSignalStrengthFormat');
699 signalStrength = signalStrength.replace('$1', data.strength);
700 $('wifi-signal-strength').textContent = signalStrength;
687 if (data.hardwareAddress) { 701 if (data.hardwareAddress) {
688 $('wifi-hardware-address').textContent = data.hardwareAddress; 702 $('wifi-hardware-address').textContent = data.hardwareAddress;
689 $('wifi-hardware-address-entry').hidden = false; 703 $('wifi-hardware-address-entry').hidden = false;
690 } else { 704 } else {
691 $('wifi-hardware-address-entry').hidden = true; 705 $('wifi-hardware-address-entry').hidden = true;
692 } 706 }
693 detailsPage.showPreferred = data.showPreferred; 707 detailsPage.showPreferred = data.showPreferred;
694 $('prefer-network-wifi').checked = data.preferred.value; 708 $('prefer-network-wifi').checked = data.preferred.value;
695 $('prefer-network-wifi').disabled = !data.remembered; 709 $('prefer-network-wifi').disabled = !data.remembered;
696 $('auto-connect-network-wifi').checked = data.autoConnect.value; 710 $('auto-connect-network-wifi').checked = data.autoConnect.value;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 848
835 // Don't show page name in address bar and in history to prevent people 849 // Don't show page name in address bar and in history to prevent people
836 // navigate here by hand and solve issue with page session restore. 850 // navigate here by hand and solve issue with page session restore.
837 OptionsPage.showPageByName('detailsInternetPage', false); 851 OptionsPage.showPageByName('detailsInternetPage', false);
838 }; 852 };
839 853
840 return { 854 return {
841 DetailsInternetPage: DetailsInternetPage 855 DetailsInternetPage: DetailsInternetPage
842 }; 856 };
843 }); 857 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698