chrome/browser/resources/settings/internet_page/internet_detail_page.html - Issue 1403773002: Fix VPN connected logic in internet settings

Side by Side Diff: chrome/browser/resources/settings/internet_page/internet_detail_page.html

Issue 1403773002: Fix VPN connected logic in internet settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 2 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

« no previous file with comments | « no previous file | chrome/browser/resources/settings/internet_page/internet_detail_page.js » ('j') | chrome/browser/resources/settings/internet_page/internet_page.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml">	3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml">

4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">

6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">	6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">

7 <link rel="import" href="chrome://resources/cr_elements/cr_collapse/cr_collapse. html">	7 <link rel="import" href="chrome://resources/cr_elements/cr_collapse/cr_collapse. html">

8 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">	8 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">

9 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html">	9 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html">

10 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">	10 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 <span class="flex"></span>	83 <span class="flex"></span>

84 <paper-button hidden$="[[!showViewAccount_(networkProperties)]]"	84 <paper-button hidden$="[[!showViewAccount_(networkProperties)]]"

85 on-tap="onViewAccountTap_">	85 on-tap="onViewAccountTap_">

86 View Account	86 View Account

87 </paper-button>	87 </paper-button>

88 <paper-button hidden$="[[!showActivate_(networkProperties)]]"	88 <paper-button hidden$="[[!showActivate_(networkProperties)]]"

89 on-tap="onActivateTap_">	89 on-tap="onActivateTap_">

90 Activate	90 Activate

91 </paper-button>	91 </paper-button>

92 <paper-button hidden$="[[!showConnect_(networkProperties)]]"	92 <paper-button hidden$="[[!showConnect_(networkProperties)]]"

93 disabled="[[!enableConnect_(networkProperties)]]"	93 disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]"

94 on-tap="onConnectTap_">	94 on-tap="onConnectTap_">

95 Connect	95 Connect

96 </paper-button>	96 </paper-button>

97 <paper-button hidden$="[[!showDisconnect_(networkProperties)]]"	97 <paper-button hidden$="[[!showDisconnect_(networkProperties)]]"

98 on-tap="onDisconnectTap_">	98 on-tap="onDisconnectTap_">

99 Disconnect	99 Disconnect

100 </paper-button>	100 </paper-button>

101 </div>	101 </div>

102	102

103 <!-- Advanced section -->	103 <!-- Advanced section -->

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
172 </network-property-list>	172 </network-property-list>

173 </cr-collapse>	173 </cr-collapse>

174 </div>	174 </div>

175 </cr-collapse>	175 </cr-collapse>

176 </div>	176 </div>

177 </div>	177 </div>

178 </div>	178 </div>

179 </template>	179 </template>

180 <script src="internet_detail_page.js"></script>	180 <script src="internet_detail_page.js"></script>

181 </dom-module>	181 </dom-module>

OLD	NEW