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

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

Issue 2971163002: Add local protection setting to chrome://settings/system
Patch Set: linux-only Created 3 years, 5 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/system_page/system_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/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 2
3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
6 <link rel="import" href="../controls/extension_controlled_indicator.html"> 6 <link rel="import" href="../controls/extension_controlled_indicator.html">
7 <link rel="import" href="../controls/settings_toggle_button.html"> 7 <link rel="import" href="../controls/settings_toggle_button.html">
8 <link rel="import" href="../lifetime_browser_proxy.html"> 8 <link rel="import" href="../lifetime_browser_proxy.html">
9 <link rel="import" href="../prefs/prefs.html"> 9 <link rel="import" href="../prefs/prefs.html">
10 <link rel="import" href="../settings_shared_css.html"> 10 <link rel="import" href="../settings_shared_css.html">
(...skipping 15 matching lines...) Expand all
26 pref="{{prefs.hardware_acceleration_mode.enabled}}" 26 pref="{{prefs.hardware_acceleration_mode.enabled}}"
27 label="$i18n{hardwareAccelerationLabel}"> 27 label="$i18n{hardwareAccelerationLabel}">
28 <template is="dom-if" if="[[shouldShowRestart_( 28 <template is="dom-if" if="[[shouldShowRestart_(
29 prefs.hardware_acceleration_mode.enabled.value)]]"> 29 prefs.hardware_acceleration_mode.enabled.value)]]">
30 <paper-button on-tap="onRestartTap_" class="more-actions"> 30 <paper-button on-tap="onRestartTap_" class="more-actions">
31 $i18n{restart} 31 $i18n{restart}
32 </paper-button> 32 </paper-button>
33 </template> 33 </template>
34 </settings-toggle-button> 34 </settings-toggle-button>
35 </div> 35 </div>
36 <div class="settings-box" hidden="[[hideProtection_]]">
37 <settings-toggle-button class="start" id="protectionControl"
38 pref="[[protectionPref_]]"
39 label="Disable local encryption TODO(i18n)"
40 on-settings-boolean-control-change="onProtectionChange_"
41 no-set-pref>
42 </settings-toggle-button>
43 </div>
36 <div id="proxy" class="settings-box" on-tap="onProxyTap_" 44 <div id="proxy" class="settings-box" on-tap="onProxyTap_"
37 actionable$="[[!isProxyEnforcedByPolicy_]]"> 45 actionable$="[[!isProxyEnforcedByPolicy_]]">
38 <div class="start">$i18n{proxySettingsLabel}</div> 46 <div class="start">$i18n{proxySettingsLabel}</div>
39 <button is="paper-icon-button-light" class="icon-external" 47 <button is="paper-icon-button-light" class="icon-external"
40 aria-label="$i18n{proxySettingsLabel}" 48 aria-label="$i18n{proxySettingsLabel}"
41 hidden$="[[isProxyEnforcedByPolicy_]]"></button> 49 hidden$="[[isProxyEnforcedByPolicy_]]"></button>
42 <template is="dom-if" if="[[isProxyEnforcedByPolicy_]]"> 50 <template is="dom-if" if="[[isProxyEnforcedByPolicy_]]">
43 <cr-policy-pref-indicator pref="[[prefs.proxy]]" 51 <cr-policy-pref-indicator pref="[[prefs.proxy]]"
44 icon-aria-label="$i18n{proxySettingsLabel}"> 52 icon-aria-label="$i18n{proxySettingsLabel}">
45 </cr-policy-pref-indicator> 53 </cr-policy-pref-indicator>
46 </template> 54 </template>
47 </div> 55 </div>
48 <template is="dom-if" if="[[prefs.proxy.extensionId]]"> 56 <template is="dom-if" if="[[prefs.proxy.extensionId]]">
49 <div class="settings-box continuation"> 57 <div class="settings-box continuation">
50 <extension-controlled-indicator class="start" 58 <extension-controlled-indicator class="start"
51 extension-id="[[prefs.proxy.extensionId]]" 59 extension-id="[[prefs.proxy.extensionId]]"
52 extension-name="[[prefs.proxy.controlledByName]]" 60 extension-name="[[prefs.proxy.controlledByName]]"
53 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]" 61 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"
54 on-extension-disable="onExtensionDisable_"> 62 on-extension-disable="onExtensionDisable_">
55 </extension-controlled-indicator> 63 </extension-controlled-indicator>
56 </div> 64 </div>
57 </template> 65 </template>
58 </template> 66 </template>
59 <script src="system_page.js"></script> 67 <script src="system_page.js"></script>
60 </dom-module> 68 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/system_page/system_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698