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

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

Issue 2180393002: MD Settings: made proxy button respect policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@controlled-button
Patch Set: Created 4 years, 4 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 | « chrome/browser/extensions/api/settings_private/prefs_util.cc ('k') | no next file » | 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 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
3 <link rel="import" href="/controls/controlled_button.html">
3 <link rel="import" href="/controls/settings_checkbox.html"> 4 <link rel="import" href="/controls/settings_checkbox.html">
4 <link rel="import" href="/lifetime_browser_proxy.html"> 5 <link rel="import" href="/lifetime_browser_proxy.html">
5 <link rel="import" href="/prefs/prefs.html"> 6 <link rel="import" href="/prefs/prefs.html">
6 <link rel="import" href="/settings_shared_css.html"> 7 <link rel="import" href="/settings_shared_css.html">
7 <link rel="import" href="/system_page/system_page_browser_proxy.html"> 8 <link rel="import" href="/system_page/system_page_browser_proxy.html">
8 9
9 <dom-module id="settings-system-page"> 10 <dom-module id="settings-system-page">
10 <template> 11 <template>
11 <style include="settings-shared"> 12 <style include="settings-shared">
12 /* TODO(dbeam): is it worth generalizing this style? Does something like 13 /* TODO(dbeam): is it worth generalizing this style? Does something like
(...skipping 17 matching lines...) Expand all
30 <settings-checkbox label="$i18n{hardwareAccelerationLabel}" 31 <settings-checkbox label="$i18n{hardwareAccelerationLabel}"
31 pref="{{prefs.hardware_acceleration_mode.enabled}}"> 32 pref="{{prefs.hardware_acceleration_mode.enabled}}">
32 </settings-checkbox> 33 </settings-checkbox>
33 <template is="dom-if" if="[[shouldShowRestart_( 34 <template is="dom-if" if="[[shouldShowRestart_(
34 prefs.hardware_acceleration_mode.enabled.value)]]"> 35 prefs.hardware_acceleration_mode.enabled.value)]]">
35 <paper-button on-tap="onRestartTap_">$i18n{restart}</paper-button> 36 <paper-button on-tap="onRestartTap_">$i18n{restart}</paper-button>
36 </template> 37 </template>
37 </div> 38 </div>
38 </div> 39 </div>
39 <div class="settings-box"> 40 <div class="settings-box">
40 <paper-button class="primary-button" on-tap="onChangeProxySettingsTap_"> 41 <controlled-button class="primary-button" pref="[[prefs.proxy]]"
42 on-tap="onChangeProxySettingsTap_">
41 $i18n{changeProxySettings} 43 $i18n{changeProxySettings}
42 </paper-button> 44 </controlled-button>
stevenjb 2016/07/27 16:47:32 This is *so* much better than what we have in opti
Dan Beam 2016/07/29 03:46:51 just imagine how great everything will be the THIR
43 </div> 45 </div>
44 </template> 46 </template>
45 <script src="/system_page/system_page.js"></script> 47 <script src="/system_page/system_page.js"></script>
46 </dom-module> 48 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/settings_private/prefs_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698