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

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

Issue 2709573006: MD Settings: Internet page cleanup + simple tests (Closed)
Patch Set: nits Created 3 years, 9 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_page.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 2 <link rel="import" href="chrome://resources/cr_elements/icons.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://resources/html/i18n_behavior.html"> 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
5 <link rel="import" href="chrome://resources/html/polymer.html"> 5 <link rel="import" href="chrome://resources/html/polymer.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
9 <link rel="import" href="../prefs/prefs.html"> 9 <link rel="import" href="../prefs/prefs.html">
10 <link rel="import" href="../route.html"> 10 <link rel="import" href="../route.html">
(...skipping 13 matching lines...) Expand all
24 24
25 iron-icon { 25 iron-icon {
26 -webkit-margin-end: 12px; 26 -webkit-margin-end: 12px;
27 -webkit-margin-start: 4px; 27 -webkit-margin-start: 4px;
28 height: 24px; 28 height: 24px;
29 width: 24px; 29 width: 24px;
30 } 30 }
31 </style> 31 </style>
32 <settings-animated-pages id="pages" section="internet"> 32 <settings-animated-pages id="pages" section="internet">
33 <neon-animatable route-path="default"> 33 <neon-animatable route-path="default">
34 <network-summary on-show-detail="onShowDetail_" 34 <network-summary default-network="{{defaultNetwork}}"
35 default-network="{{defaultNetwork}}" 35 device-states="{{deviceStates}}"
36 on-show-known-networks="onShowKnownNetworks_"
37 global-policy="[[globalPolicy_]]" 36 global-policy="[[globalPolicy_]]"
38 networking-private="[[networkingPrivate]]"> 37 networking-private="[[networkingPrivate]]">
39 </network-summary> 38 </network-summary>
40 <template is="dom-if" if="[[allowAddConnection_(globalPolicy_)]]"> 39 <template is="dom-if" if="[[allowAddConnection_(globalPolicy_)]]">
41 <div actionable class="settings-box two-line" 40 <div actionable class="settings-box two-line"
42 on-tap="onExpandAddConnectionsTap_"> 41 on-tap="onExpandAddConnectionsTap_">
43 <div class="start layout horizontal center"> 42 <div class="start layout horizontal center">
44 <iron-icon icon="cr:add"></iron-icon> 43 <iron-icon icon="cr:add"></iron-icon>
45 <div>$i18n{internetAddConnection}</div> 44 <div>$i18n{internetAddConnection}</div>
46 </div> 45 </div>
(...skipping 26 matching lines...) Expand all
73 </template> 72 </template>
74 </template> 73 </template>
75 </template> 74 </template>
76 <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]"> 75 <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]">
77 <div class="settings-box"> 76 <div class="settings-box">
78 <iron-icon class="policy" icon="cr20:domain"></iron-icon> 77 <iron-icon class="policy" icon="cr20:domain"></iron-icon>
79 <div>$i18n{internetAddConnectionNotAllowed}</div> 78 <div>$i18n{internetAddConnectionNotAllowed}</div>
80 </div> 79 </div>
81 </template> 80 </template>
82 </neon-animatable> 81 </neon-animatable>
82
83 <template is="dom-if" route-path="/networkDetail" no-search> 83 <template is="dom-if" route-path="/networkDetail" no-search>
84 <settings-subpage page-title="$i18n{internetDetailPageTitle}"> 84 <settings-subpage page-title="$i18n{internetDetailPageTitle}">
85 <settings-internet-detail-page prefs="{{prefs}}" 85 <settings-internet-detail-page prefs="{{prefs}}"
86 default-network="[[defaultNetwork]]" 86 default-network="[[defaultNetwork]]"
87 global-policy="[[globalPolicy_]]" 87 global-policy="[[globalPolicy_]]"
88 networking-private="[[networkingPrivate]]"> 88 networking-private="[[networkingPrivate]]">
89 </settings-internet-detail-page> 89 </settings-internet-detail-page>
90 </settings-subpage> 90 </settings-subpage>
91 </template> 91 </template>
92
92 <template is="dom-if" route-path="/knownNetworks" no-search> 93 <template is="dom-if" route-path="/knownNetworks" no-search>
93 <settings-subpage page-title="$i18n{internetKnownNetworksPageTitle}"> 94 <settings-subpage page-title="$i18n{internetKnownNetworksPageTitle}">
94 <settings-internet-known-networks-page 95 <settings-internet-known-networks-page
95 network-type="[[knownNetworksType_]]" 96 network-type="[[knownNetworksType_]]"
96 on-show-detail="onShowDetail_"
97 networking-private="[[networkingPrivate]]"> 97 networking-private="[[networkingPrivate]]">
98 </settings-internet-known-networks-page> 98 </settings-internet-known-networks-page>
99 </settings-subpage> 99 </settings-subpage>
100 </template> 100 </template>
101 </settings-animated-pages> 101 </settings-animated-pages>
102 </template> 102 </template>
103 <script src="internet_page.js"></script> 103 <script src="internet_page.js"></script>
104 </dom-module> 104 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/internet_page/internet_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698