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

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

Issue 2913323003: Settings: Network: Merge Tether networks into Mobile subpage (Closed)
Patch Set: Fix browser_tests Created 3 years, 6 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/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 2
3 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 3 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
4 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 4 <link rel="import" href="chrome://resources/cr_elements/icons.html">
5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
7 <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/iron-icon/iron-icon.htm l">
8 <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/neon-animation/neon-ani matable.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
10 <link rel="import" href="../prefs/prefs.html"> 10 <link rel="import" href="../prefs/prefs.html">
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 networking-private="[[networkingPrivate]]"> 106 networking-private="[[networkingPrivate]]">
107 </settings-internet-known-networks-page> 107 </settings-internet-known-networks-page>
108 </settings-subpage> 108 </settings-subpage>
109 </template> 109 </template>
110 110
111 <template is="dom-if" route-path="/networks" no-search> 111 <template is="dom-if" route-path="/networks" no-search>
112 <settings-subpage page-title="[[getNetworksPageTitle_(subpageType_)]]" 112 <settings-subpage page-title="[[getNetworksPageTitle_(subpageType_)]]"
113 show-spinner="[[showSpinner_]]"> 113 show-spinner="[[showSpinner_]]">
114 <settings-internet-subpage 114 <settings-internet-subpage
115 default-network="[[defaultNetwork]]" 115 default-network="[[defaultNetwork]]"
116 device-state="[[get(subpageType_, deviceStates)]]" 116 device-state="[[getDeviceState_(subpageType_, deviceStates)]]"
117 tether-device-state="[[get('Tether', deviceStates)]]"
117 global-policy="[[globalPolicy_]]" 118 global-policy="[[globalPolicy_]]"
118 third-party-vpn-providers="[[thirdPartyVpnProviders_]]" 119 third-party-vpn-providers="[[thirdPartyVpnProviders_]]"
119 networking-private="[[networkingPrivate]]" 120 networking-private="[[networkingPrivate]]"
120 show-spinner="{{showSpinner_}}"> 121 show-spinner="{{showSpinner_}}">
121 </settings-bluetooth-subpage> 122 </settings-bluetooth-subpage>
122 </settings-subpage> 123 </settings-subpage>
123 </template> 124 </template>
124 125
125 </settings-animated-pages> 126 </settings-animated-pages>
126 </template> 127 </template>
127 <script src="internet_page.js"></script> 128 <script src="internet_page.js"></script>
128 </dom-module> 129 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698