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

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

Issue 1403773002: Fix VPN connected logic in internet settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make closure happy Created 5 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 unified diff | Download patch
OLDNEW
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/neon-animation/neon-ani matable.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
4 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 4 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
5 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> 5 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
6 <link rel="import" href="internet_detail_page.html"> 6 <link rel="import" href="internet_detail_page.html">
7 <link rel="import" href="internet_known_networks_page.html"> 7 <link rel="import" href="internet_known_networks_page.html">
8 <link rel="import" href="network_summary.html"> 8 <link rel="import" href="network_summary.html">
9 9
10 <dom-module id="settings-internet-page"> 10 <dom-module id="settings-internet-page">
11 <link rel="import" type="css" 11 <link rel="import" type="css"
12 href="chrome://md-settings/settings_page/settings_page.css"> 12 href="chrome://md-settings/settings_page/settings_page.css">
13 <template> 13 <template>
14 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 14 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
15 section="internet"> 15 section="internet">
16 <neon-animatable id="main"> 16 <neon-animatable id="main">
17 <network-summary on-show-detail="onShowDetail_" 17 <network-summary on-show-detail="onShowDetail_"
18 default-network="{{defaultNetwork}}"
18 on-show-known-networks="onShowKnownNetworks_"> 19 on-show-known-networks="onShowKnownNetworks_">
19 </network-summary> 20 </network-summary>
20 </neon-animatable> 21 </neon-animatable>
21 <neon-animatable id="network-detail"> 22 <neon-animatable id="network-detail">
22 <settings-subheader i18n-values="page-title:internetDetailPageTitle"> 23 <settings-subheader i18n-values="page-title:internetDetailPageTitle">
23 </settings-subheader> 24 </settings-subheader>
24 <settings-internet-detail-page guid="[[detailGuid]]" 25 <settings-internet-detail-page
26 guid="[[detailGuid]]"
27 default-network="[[defaultNetwork]]"
25 on-close="onBackTap_"> 28 on-close="onBackTap_">
26 </settings-internet-detail-page> 29 </settings-internet-detail-page>
27 </neon-animatable> 30 </neon-animatable>
28 <neon-animatable id="known-networks"> 31 <neon-animatable id="known-networks">
29 <settings-subheader 32 <settings-subheader
30 i18n-values="page-title:internetKnownNetworksPageTitle"> 33 i18n-values="page-title:internetKnownNetworksPageTitle">
31 </settings-subheader> 34 </settings-subheader>
32 <settings-internet-known-networks-page 35 <settings-internet-known-networks-page
33 network-type="[[knownNetworksType]]" 36 network-type="[[knownNetworksType]]"
34 on-show-detail="onShowDetail_"> 37 on-show-detail="onShowDetail_">
35 </settings-internet-known-networks-page> 38 </settings-internet-known-networks-page>
36 </neon-animatable> 39 </neon-animatable>
37 </settings-animated-pages> 40 </settings-animated-pages>
38 </template> 41 </template>
39 <script src="internet_page.js"></script> 42 <script src="internet_page.js"></script>
40 </dom-module> 43 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698