Chromium Code Reviews| 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://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | |
| 3 <link rel="import" href="/controls/controlled_button.html"> | 4 <link rel="import" href="/controls/controlled_button.html"> |
| 4 <link rel="import" href="/controls/settings_checkbox.html"> | 5 <link rel="import" href="/controls/settings_checkbox.html"> |
| 5 <link rel="import" href="/lifetime_browser_proxy.html"> | 6 <link rel="import" href="/lifetime_browser_proxy.html"> |
| 6 <link rel="import" href="/prefs/prefs.html"> | 7 <link rel="import" href="/prefs/prefs.html"> |
| 7 <link rel="import" href="/settings_shared_css.html"> | 8 <link rel="import" href="/settings_shared_css.html"> |
| 8 <link rel="import" href="/system_page/system_page_browser_proxy.html"> | 9 <link rel="import" href="/system_page/system_page_browser_proxy.html"> |
| 9 | 10 |
| 10 <dom-module id="settings-system-page"> | 11 <dom-module id="settings-system-page"> |
| 11 <template> | 12 <template> |
| 12 <style include="settings-shared"> | 13 <style include="settings-shared"> |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 30 <div id="hardware-acceleration"> | 31 <div id="hardware-acceleration"> |
| 31 <settings-checkbox label="$i18n{hardwareAccelerationLabel}" | 32 <settings-checkbox label="$i18n{hardwareAccelerationLabel}" |
| 32 pref="{{prefs.hardware_acceleration_mode.enabled}}"> | 33 pref="{{prefs.hardware_acceleration_mode.enabled}}"> |
| 33 </settings-checkbox> | 34 </settings-checkbox> |
| 34 <template is="dom-if" if="[[shouldShowRestart_( | 35 <template is="dom-if" if="[[shouldShowRestart_( |
| 35 prefs.hardware_acceleration_mode.enabled.value)]]"> | 36 prefs.hardware_acceleration_mode.enabled.value)]]"> |
| 36 <paper-button on-tap="onRestartTap_">$i18n{restart}</paper-button> | 37 <paper-button on-tap="onRestartTap_">$i18n{restart}</paper-button> |
| 37 </template> | 38 </template> |
| 38 </div> | 39 </div> |
| 39 </div> | 40 </div> |
| 40 <div class="settings-box"> | 41 <div class="settings-box two-line" on-tap="onChangeProxySettingsTap_" |
| 41 <controlled-button class="primary-button" pref="[[prefs.proxy]]" | 42 actionable> |
| 42 on-tap="onChangeProxySettingsTap_"> | 43 <div class="start"> |
| 43 $i18n{changeProxySettings} | 44 $i18n{changeProxySettings} |
| 45 <div class="secondary">$i18n{changeProxySettingsDescription}</div> | |
| 46 </div> | |
| 47 <!-- TODO(dschuyler): This controlled-button should be replaced with | |
| 48 something that shows the controlled icon without being a button. --> | |
| 49 <controlled-button pref="[[prefs.proxy]]"> | |
|
Dan Beam
2016/09/27 23:03:53
but not these?
dschuyler
2016/09/28 21:03:26
I kept the ones that are not a controlled-button.
| |
| 44 </controlled-button> | 50 </controlled-button> |
| 51 <button class="icon-external" is="paper-icon-button-light"> | |
| 52 </button> | |
| 45 </div> | 53 </div> |
| 46 </template> | 54 </template> |
| 47 <script src="/system_page/system_page.js"></script> | 55 <script src="/system_page/system_page.js"></script> |
| 48 </dom-module> | 56 </dom-module> |
| OLD | NEW |