| Index: chrome/browser/resources/settings/internet_page/network_summary.js
|
| diff --git a/chrome/browser/resources/settings/internet_page/network_summary.js b/chrome/browser/resources/settings/internet_page/network_summary.js
|
| index 0b65a68fd959a582e8402a867ef60d18fe228612..15e42bdc2482f2912170cd019a73be18f0696333 100644
|
| --- a/chrome/browser/resources/settings/internet_page/network_summary.js
|
| +++ b/chrome/browser/resources/settings/internet_page/network_summary.js
|
| @@ -48,9 +48,6 @@ Polymer({
|
| notify: true,
|
| },
|
|
|
| - /** @type {!chrome.networkingPrivate.GlobalPolicy|undefined} */
|
| - globalPolicy: Object,
|
| -
|
| /**
|
| * Interface for networkingPrivate calls, passed from internet_page.
|
| * @type {NetworkingPrivate}
|
| @@ -94,25 +91,25 @@ Polymer({
|
|
|
| /**
|
| * Listener function for chrome.networkingPrivate.onNetworkListChanged event.
|
| - * @type {function(!Array<string>)}
|
| + * @type {?function(!Array<string>)}
|
| * @private
|
| */
|
| - networkListChangedListener_: function() {},
|
| + networkListChangedListener_: null,
|
|
|
| /**
|
| * Listener function for chrome.networkingPrivate.onDeviceStateListChanged
|
| * event.
|
| - * @type {function(!Array<string>)}
|
| + * @type {?function(!Array<string>)}
|
| * @private
|
| */
|
| - deviceStateListChangedListener_: function() {},
|
| + deviceStateListChangedListener_: null,
|
|
|
| /**
|
| * Listener function for chrome.networkingPrivate.onNetworksChanged event.
|
| - * @type {function(!Array<string>)}
|
| + * @type {?function(!Array<string>)}
|
| * @private
|
| */
|
| - networksChangedListener_: function() {},
|
| + networksChangedListener_: null,
|
|
|
| /**
|
| * Set of GUIDs identifying active networks, one for each type.
|
| @@ -125,17 +122,19 @@ Polymer({
|
| attached: function() {
|
| this.getNetworkLists_();
|
|
|
| - this.networkListChangedListener_ =
|
| + this.networkListChangedListener_ = this.networkListChangedListener_ ||
|
| this.onNetworkListChangedEvent_.bind(this);
|
| this.networkingPrivate.onNetworkListChanged.addListener(
|
| this.networkListChangedListener_);
|
|
|
| this.deviceStateListChangedListener_ =
|
| + this.deviceStateListChangedListener_ ||
|
| this.onDeviceStateListChangedEvent_.bind(this);
|
| this.networkingPrivate.onDeviceStateListChanged.addListener(
|
| this.deviceStateListChangedListener_);
|
|
|
| - this.networksChangedListener_ = this.onNetworksChangedEvent_.bind(this);
|
| + this.networksChangedListener_ = this.networksChangedListener_ ||
|
| + this.onNetworksChangedEvent_.bind(this);
|
| this.networkingPrivate.onNetworksChanged.addListener(
|
| this.networksChangedListener_);
|
| },
|
| @@ -143,39 +142,13 @@ Polymer({
|
| /** @override */
|
| detached: function() {
|
| this.networkingPrivate.onNetworkListChanged.removeListener(
|
| - this.networkListChangedListener_);
|
| + assert(this.networkListChangedListener_));
|
|
|
| this.networkingPrivate.onDeviceStateListChanged.removeListener(
|
| - this.deviceStateListChangedListener_);
|
| + assert(this.deviceStateListChangedListener_));
|
|
|
| this.networkingPrivate.onNetworksChanged.removeListener(
|
| - this.networksChangedListener_);
|
| - },
|
| -
|
| - /**
|
| - * Event triggered when the network-summary-item is expanded.
|
| - * @param {!{detail: {expanded: boolean, type: string}}} event
|
| - * @private
|
| - */
|
| - onExpanded_: function(event) {
|
| - if (!event.detail.expanded)
|
| - return;
|
| - // Get the latest network states.
|
| - this.getNetworkStates_();
|
| - },
|
| -
|
| - /**
|
| - * Event triggered when a network-summary-item is selected.
|
| - * @param {!{detail: !CrOnc.NetworkStateProperties}} event
|
| - * @private
|
| - */
|
| - onSelected_: function(event) {
|
| - var state = event.detail;
|
| - if (this.canConnect_(state, this.globalPolicy)) {
|
| - this.connectToNetwork_(state);
|
| - return;
|
| - }
|
| - this.fire('show-detail', state);
|
| + assert(this.networksChangedListener_));
|
| },
|
|
|
| /**
|
| @@ -211,25 +184,6 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * Determines whether or not a network state can be connected to.
|
| - * @param {!CrOnc.NetworkStateProperties} state The network state.
|
| - * @param {!chrome.networkingPrivate.GlobalPolicy|undefined} globalPolicy
|
| - * @private
|
| - */
|
| - canConnect_: function(state, globalPolicy) {
|
| - if (state.Type == CrOnc.Type.ETHERNET ||
|
| - state.Type == CrOnc.Type.VPN && !this.defaultNetwork) {
|
| - return false;
|
| - }
|
| - if (state.Type == CrOnc.Type.WI_FI && !!globalPolicy &&
|
| - globalPolicy.AllowOnlyPolicyNetworksToConnect &&
|
| - !this.isPolicySource(state.Source)) {
|
| - return false;
|
| - }
|
| - return state.ConnectionState == CrOnc.ConnectionState.NOT_CONNECTED;
|
| - },
|
| -
|
| - /**
|
| * networkingPrivate.getState event callback for an active state.
|
| * @param {string} id The id of the requested state.
|
| * @param {!chrome.networkingPrivate.NetworkStateProperties} state
|
| @@ -264,25 +218,6 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * Handles UI requests to connect to a network.
|
| - * TODO(stevenjb): Handle Cellular activation, etc.
|
| - * @param {!CrOnc.NetworkStateProperties} state The network state.
|
| - * @private
|
| - */
|
| - connectToNetwork_: function(state) {
|
| - this.networkingPrivate.startConnect(state.GUID, function() {
|
| - if (chrome.runtime.lastError) {
|
| - var message = chrome.runtime.lastError.message;
|
| - if (message != 'connecting') {
|
| - console.error(
|
| - 'Unexpected networkingPrivate.startConnect error: ' + message +
|
| - 'For: ' + state.GUID);
|
| - }
|
| - }
|
| - });
|
| - },
|
| -
|
| - /**
|
| * Requests the list of device states and network states from Chrome.
|
| * Updates deviceStates, activeNetworkStates, and networkStateLists once the
|
| * results are returned from Chrome.
|
|
|