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

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

Issue 2921533005: Settings: Network: Fix some spacing issues (Closed)
Patch Set: 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_dialog/cr_dialog.html "> 3 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
4 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> 4 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.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/cr_elements/policy/cr_policy_network _behavior.html"> 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
8 <link rel="import" href="chrome://resources/html/assert.html"> 8 <link rel="import" href="chrome://resources/html/assert.html">
9 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> 9 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
10 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 10 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } 45 }
46 46
47 #manualProxy { 47 #manualProxy {
48 @apply(--settings-list-frame-padding); 48 @apply(--settings-list-frame-padding);
49 } 49 }
50 </style> 50 </style>
51 51
52 <!-- Policy indicator. Only one dom-if below will be shown. --> 52 <!-- Policy indicator. Only one dom-if below will be shown. -->
53 <template is="dom-if" 53 <template is="dom-if"
54 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> 54 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]">
55 <div class="list-frame"> 55 <div class="settings-box indent">
56 <div class="layout horizontal center"> 56 <div class="layout horizontal center">
57 <cr-policy-network-indicator 57 <cr-policy-network-indicator
58 property="[[networkProperties.ProxySettings.Type]]" 58 property="[[networkProperties.ProxySettings.Type]]"
59 no-extension-indicator> 59 no-extension-indicator>
60 </cr-policy-network-indicator> 60 </cr-policy-network-indicator>
61 <div>$i18n{networkProxyEnforcedPolicy}</div> 61 <div>$i18n{networkProxyEnforcedPolicy}</div>
62 </div> 62 </div>
63 </div> 63 </div>
64 </template> 64 </template>
65 <template is="dom-if" 65 <template is="dom-if"
66 if="[[shouldShowExtensionIndicator_(networkProperties)]]"> 66 if="[[shouldShowExtensionIndicator_(networkProperties)]]">
67 <div class="list-frame"> 67 <div class="settings-box indent">
68 <extension-controlled-indicator 68 <extension-controlled-indicator
69 extension-id="[[prefs.proxy.extensionId]]" 69 extension-id="[[prefs.proxy.extensionId]]"
70 extension-name="[[prefs.proxy.controlledByName]]" 70 extension-name="[[prefs.proxy.controlledByName]]"
71 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"> 71 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]">
72 </extension-controlled-indicator> 72 </extension-controlled-indicator>
73 </div> 73 </div>
74 </template> 74 </template>
75 75
76 <!-- Allow shared proxies --> 76 <!-- Allow shared proxies -->
77 <div class="settings-box continuation indent" 77 <div class="settings-box continuation indent"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 </paper-button> 215 </paper-button>
216 <paper-button class="action-button" 216 <paper-button class="action-button"
217 on-tap="onAllowSharedDialogConfirm_"> 217 on-tap="onAllowSharedDialogConfirm_">
218 $i18n{confirm} 218 $i18n{confirm}
219 </paper-button> 219 </paper-button>
220 </div> 220 </div>
221 </dialog> 221 </dialog>
222 </template> 222 </template>
223 <script src="network_proxy.js"></script> 223 <script src="network_proxy.js"></script>
224 </dom-module> 224 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698