| 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/iron-flex-layout/iron-f
lex-layout-classes.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 4 <link rel="import" href="/controls/controlled_button.html"> | 4 <link rel="import" href="/controls/controlled_button.html"> |
| 5 <link rel="import" href="/controls/extension_controlled_indicator.html"> | 5 <link rel="import" href="/controls/extension_controlled_indicator.html"> |
| 6 <link rel="import" href="/controls/settings_checkbox.html"> | 6 <link rel="import" href="/controls/settings_toggle_button.html"> |
| 7 <link rel="import" href="/lifetime_browser_proxy.html"> | 7 <link rel="import" href="/lifetime_browser_proxy.html"> |
| 8 <link rel="import" href="/prefs/prefs.html"> | 8 <link rel="import" href="/prefs/prefs.html"> |
| 9 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
| 10 <link rel="import" href="/system_page/system_page_browser_proxy.html"> | 10 <link rel="import" href="/system_page/system_page_browser_proxy.html"> |
| 11 | 11 |
| 12 <dom-module id="settings-system-page"> | 12 <dom-module id="settings-system-page"> |
| 13 <template> | 13 <template> |
| 14 <style include="settings-shared"></style> | 14 <style include="settings-shared"></style> |
| 15 <div class="settings-box block first"> | 15 <div class="settings-box block first"> |
| 16 <if expr="not is_macosx"> | 16 <if expr="not is_macosx"> |
| 17 <settings-checkbox label="$i18n{backgroundAppsLabel}" | 17 <settings-toggle-button |
| 18 pref="{{prefs.background_mode.enabled}}"> | 18 pref="{{prefs.background_mode.enabled}}" |
| 19 </settings-checkbox> | 19 label="$i18n{backgroundAppsLabel}"> |
| 20 </settings-toggle-button> |
| 20 </if> | 21 </if> |
| 21 <div id="hardware-acceleration" class="layout horizontal center"> | 22 <settings-toggle-button class="flex" id="hardwareAcceleration" |
| 22 <settings-checkbox class="flex" label="$i18n{hardwareAccelerationLabel}" | 23 pref="{{prefs.hardware_acceleration_mode.enabled}}" |
| 23 pref="{{prefs.hardware_acceleration_mode.enabled}}"> | 24 label="$i18n{hardwareAccelerationLabel}"> |
| 24 </settings-checkbox> | |
| 25 <template is="dom-if" if="[[shouldShowRestart_( | 25 <template is="dom-if" if="[[shouldShowRestart_( |
| 26 prefs.hardware_acceleration_mode.enabled.value)]]"> | 26 prefs.hardware_acceleration_mode.enabled.value)]]"> |
| 27 <paper-button on-tap="onRestartTap_">$i18n{restart}</paper-button> | 27 <paper-button on-tap="onRestartTap_" class="more-actions"> |
| 28 $i18n{restart} |
| 29 </paper-button> |
| 28 </template> | 30 </template> |
| 29 </div> | 31 </settings-toggle-button> |
| 30 </div> | 32 </div> |
| 31 <div class="settings-box"> | 33 <div class="settings-box"> |
| 32 <controlled-button class="primary-button" pref="[[prefs.proxy]]" | 34 <controlled-button class="primary-button" pref="[[prefs.proxy]]" |
| 33 on-tap="onChangeProxySettingsTap_"> | 35 on-tap="onChangeProxySettingsTap_"> |
| 34 $i18n{changeProxySettings} | 36 $i18n{changeProxySettings} |
| 35 </controlled-button> | 37 </controlled-button> |
| 36 </div> | 38 </div> |
| 37 <template is="dom-if" if="[[prefs.proxy.extensionId]]"> | 39 <template is="dom-if" if="[[prefs.proxy.extensionId]]"> |
| 38 <div class="settings-box continuation"> | 40 <div class="settings-box continuation"> |
| 39 <extension-controlled-indicator class="start" | 41 <extension-controlled-indicator class="start" |
| 40 extension-id="[[prefs.proxy.extensionId]]" | 42 extension-id="[[prefs.proxy.extensionId]]" |
| 41 extension-name="[[prefs.proxy.controlledByName]]" | 43 extension-name="[[prefs.proxy.controlledByName]]" |
| 42 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]" | 44 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]" |
| 43 on-extension-disable="onExtensionDisable_"> | 45 on-extension-disable="onExtensionDisable_"> |
| 44 </extension-controlled-indicator> | 46 </extension-controlled-indicator> |
| 45 </div> | 47 </div> |
| 46 </template> | 48 </template> |
| 47 </template> | 49 </template> |
| 48 <script src="/system_page/system_page.js"></script> | 50 <script src="/system_page/system_page.js"></script> |
| 49 </dom-module> | 51 </dom-module> |
| OLD | NEW |