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

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

Issue 2720503006: MD Settings: Internet: Move network lists to a subpage (Closed)
Patch Set: Rebase 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
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">
11 <link rel="import" href="../settings_page/settings_animated_pages.html"> 11 <link rel="import" href="../settings_page/settings_animated_pages.html">
12 <link rel="import" href="../settings_page/settings_subpage.html"> 12 <link rel="import" href="../settings_page/settings_subpage.html">
13 <link rel="import" href="../settings_shared_css.html"> 13 <link rel="import" href="../settings_shared_css.html">
14 <link rel="import" href="internet_detail_page.html"> 14 <link rel="import" href="internet_detail_page.html">
15 <link rel="import" href="internet_known_networks_page.html"> 15 <link rel="import" href="internet_known_networks_page.html">
16 <link rel="import" href="internet_subpage.html">
16 <link rel="import" href="network_summary.html"> 17 <link rel="import" href="network_summary.html">
17 18
18 <dom-module id="settings-internet-page"> 19 <dom-module id="settings-internet-page">
19 <template> 20 <template>
20 <style include="settings-shared"> 21 <style include="settings-shared">
21 div.add-no-icon { 22 div.add-no-icon {
22 -webkit-margin-start: 36px 23 -webkit-margin-start: 36px
23 } 24 }
24 25
25 iron-icon { 26 iron-icon {
26 -webkit-margin-end: 12px; 27 -webkit-margin-end: 12px;
27 -webkit-margin-start: 4px; 28 -webkit-margin-start: 4px;
28 height: 24px; 29 height: 24px;
29 width: 24px; 30 width: 24px;
30 } 31 }
31 </style> 32 </style>
32 <settings-animated-pages id="pages" section="internet"> 33 <settings-animated-pages id="pages" section="internet">
33 <neon-animatable route-path="default"> 34 <neon-animatable route-path="default">
34 <network-summary default-network="{{defaultNetwork}}" 35 <network-summary default-network="{{defaultNetwork}}"
35 device-states="{{deviceStates}}" 36 device-states="{{deviceStates}}"
36 global-policy="[[globalPolicy_]]"
37 networking-private="[[networkingPrivate]]"> 37 networking-private="[[networkingPrivate]]">
38 </network-summary> 38 </network-summary>
39 <template is="dom-if" if="[[allowAddConnection_(globalPolicy_)]]"> 39 <template is="dom-if" if="[[allowAddConnection_(globalPolicy_)]]">
40 <div actionable class="settings-box two-line" 40 <div actionable class="settings-box two-line"
41 on-tap="onExpandAddConnectionsTap_"> 41 on-tap="onExpandAddConnectionsTap_">
42 <div class="start layout horizontal center"> 42 <div class="start layout horizontal center">
43 <iron-icon icon="cr:add"></iron-icon> 43 <iron-icon icon="cr:add"></iron-icon>
44 <div>$i18n{internetAddConnection}</div> 44 <div>$i18n{internetAddConnection}</div>
45 </div> 45 </div>
46 <cr-expand-button alt="$i18n{internetAddConnectionExpandA11yLabel}" 46 <cr-expand-button alt="$i18n{internetAddConnectionExpandA11yLabel}"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 </template> 91 </template>
92 92
93 <template is="dom-if" route-path="/knownNetworks" no-search> 93 <template is="dom-if" route-path="/knownNetworks" no-search>
94 <settings-subpage page-title="$i18n{internetKnownNetworksPageTitle}"> 94 <settings-subpage page-title="$i18n{internetKnownNetworksPageTitle}">
95 <settings-internet-known-networks-page 95 <settings-internet-known-networks-page
96 network-type="[[knownNetworksType_]]" 96 network-type="[[knownNetworksType_]]"
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
102 <template is="dom-if" route-path="/networks" no-search>
103 <settings-subpage page-title="[[getNetworksPageTitle_(subpageType_)]]"
104 show-spinner="[[showSpinner_]]">
105 <settings-internet-subpage
106 default-network="[[defaultNetwork]]"
107 device-state="[[get(subpageType_, deviceStates)]]"
108 global-policy="[[globalPolicy_]]"
109 third-party-vpn-providers="[[thirdPartyVpnProviders_]]"
110 networking-private="[[networkingPrivate]]"
111 show-spinner="{{showSpinner_}}">
112 </settings-bluetooth-subpage>
113 </settings-subpage>
114 </template>
115
101 </settings-animated-pages> 116 </settings-animated-pages>
102 </template> 117 </template>
103 <script src="internet_page.js"></script> 118 <script src="internet_page.js"></script>
104 </dom-module> 119 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698