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

Unified Diff: chrome/browser/resources/options/chromeos_internet_network_element.js

Issue 4976007: Don't allow connection to networks that are not connected.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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_internet_network_element.js
===================================================================
--- chrome/browser/resources/options/chromeos_internet_network_element.js (revision 66336)
+++ chrome/browser/resources/options/chromeos_internet_network_element.js (working copy)
@@ -57,7 +57,7 @@
while (item && !item.data) {
item = item.parentNode;
}
- if (item.connecting)
+ if (item.connecting || !item.connectable)
return;
if (item) {
@@ -106,7 +106,8 @@
iconURL: network[6],
remembered: network[7],
activation_state: network[8],
- restricted: network[9]
+ restricted: network[9],
+ connectable: network[10]
};
NetworkItem.decorate(el);
return el;
@@ -148,6 +149,7 @@
decorate: function() {
this.className = 'network-item';
this.connected = this.data.connected;
+ this.connectable = this.data.connectable;
this.other = this.data.servicePath == '?';
this.id = this.data.servicePath;
// textDiv holds icon, name and status text.
@@ -471,6 +473,12 @@
*/
cr.defineProperty(NetworkItem, 'other', cr.PropertyKind.BOOL_ATTR);
+ /**
+ * Whether the underlying network is connectable.
+ * @type {boolean}
+ */
+ cr.defineProperty(NetworkItem, 'connectable', cr.PropertyKind.BOOL_ATTR);
+
return {
NetworkElement: NetworkElement
};

Powered by Google App Engine
This is Rietveld 408576698