| 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="/controls/settings_checkbox.html"> | 3 <link rel="import" href="/controls/settings_checkbox.html"> |
| 4 <link rel="import" href="/lifetime_browser_proxy.html"> |
| 4 <link rel="import" href="/prefs/prefs.html"> | 5 <link rel="import" href="/prefs/prefs.html"> |
| 5 <link rel="import" href="/settings_shared_css.html"> | 6 <link rel="import" href="/settings_shared_css.html"> |
| 6 <link rel="import" href="/system_page/system_page_browser_proxy.html"> | 7 <link rel="import" href="/system_page/system_page_browser_proxy.html"> |
| 7 | 8 |
| 8 <dom-module id="settings-system-page"> | 9 <dom-module id="settings-system-page"> |
| 9 <template> | 10 <template> |
| 10 <style include="settings-shared"> | 11 <style include="settings-shared"> |
| 11 /* TODO(dbeam): is it worth generalizing this style? Does something like | 12 /* TODO(dbeam): is it worth generalizing this style? Does something like |
| 12 * this already exist (buttons after a checkbox in the same row)? */ | 13 * this already exist (buttons after a checkbox in the same row)? */ |
| 13 #hardware-acceleration { | 14 #hardware-acceleration { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 36 </div> | 37 </div> |
| 37 </div> | 38 </div> |
| 38 <div class="settings-box"> | 39 <div class="settings-box"> |
| 39 <paper-button class="primary-button" on-tap="onChangeProxySettingsTap_"> | 40 <paper-button class="primary-button" on-tap="onChangeProxySettingsTap_"> |
| 40 $i18n{changeProxySettings} | 41 $i18n{changeProxySettings} |
| 41 </paper-button> | 42 </paper-button> |
| 42 </div> | 43 </div> |
| 43 </template> | 44 </template> |
| 44 <script src="/system_page/system_page.js"></script> | 45 <script src="/system_page/system_page.js"></script> |
| 45 </dom-module> | 46 </dom-module> |
| OLD | NEW |