| OLD | NEW |
| 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="chrome://md-settings/controls/settings_checkbox.html"> | 3 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> |
| 4 <link rel="import" href="chrome://md-settings/prefs/prefs.html"> |
| 4 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 5 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 6 <link rel="import" href="chrome://md-settings/system_page/system_page_browser_pr
oxy.html"> |
| 5 | 7 |
| 6 <dom-module id="settings-system-page"> | 8 <dom-module id="settings-system-page"> |
| 7 <template> | 9 <template> |
| 8 <style include="settings-shared"></style> | 10 <style include="settings-shared"> |
| 11 /* TODO(dbeam): is it worth generalizing this style? Does something like |
| 12 * this already exist (buttons after a checkbox in the same row)? */ |
| 13 #hardware-acceleration { |
| 14 align-items: center; |
| 15 display: flex; |
| 16 } |
| 17 |
| 18 #hardware-acceleration settings-checkbox { |
| 19 flex: 1; |
| 20 } |
| 21 </style> |
| 9 <div class="settings-box block first"> | 22 <div class="settings-box block first"> |
| 10 <if expr="not is_macosx"> | 23 <if expr="not is_macosx"> |
| 11 <settings-checkbox i18n-values="label:backgroundAppsLabel" | 24 <settings-checkbox i18n-values="label:backgroundAppsLabel" |
| 12 pref="{{prefs.background_mode.enabled}}"> | 25 pref="{{prefs.background_mode.enabled}}"> |
| 13 </settings-checkbox> | 26 </settings-checkbox> |
| 14 </if> | 27 </if> |
| 15 <settings-checkbox i18n-values="label:hardwareAccelerationLabel" | 28 <div id="hardware-acceleration"> |
| 16 pref="{{prefs.hardware_acceleration_mode.enabled}}"> | 29 <settings-checkbox i18n-values="label:hardwareAccelerationLabel" |
| 17 <!-- TODO(dbeam): restart button. --> | 30 pref="{{prefs.hardware_acceleration_mode.enabled}}"> |
| 18 </settings-checkbox> | 31 </settings-checkbox> |
| 32 <template is="dom-if" if="[[shouldShowRestart_(prefs.hardware_accelerati
on_mode.enabled.value)]]"> |
| 33 <paper-button on-tap="onRestartTap_">$i18n{restart}</paper-button> |
| 34 </template> |
| 35 </div> |
| 19 </div> | 36 </div> |
| 20 <div class="settings-box"> | 37 <div class="settings-box"> |
| 21 <div class="button-strip"> | 38 <div class="button-strip"> |
| 22 <paper-button i18n-content="changeProxySettings" class="primary-button" | 39 <paper-button class="primary-button" on-tap="onChangeProxySettingsTap_"> |
| 23 on-tap="onChangeProxySettingsTap_"></paper-button> | 40 $i18n{changeProxySettings} |
| 41 </paper-button> |
| 24 </div> | 42 </div> |
| 25 </div> | 43 </div> |
| 26 </template> | 44 </template> |
| 27 <script src="chrome://md-settings/system_page/system_page.js"></script> | 45 <script src="chrome://md-settings/system_page/system_page.js"></script> |
| 28 </dom-module> | 46 </dom-module> |
| OLD | NEW |