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/controlled_button.html"> | 3 <link rel="import" href="../controls/controlled_button.html"> |
4 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 4 <link rel="import" href="../controls/extension_controlled_indicator.html"> |
5 <link rel="import" href="../controls/settings_toggle_button.html"> | 5 <link rel="import" href="../controls/settings_toggle_button.html"> |
6 <link rel="import" href="../lifetime_browser_proxy.html"> | 6 <link rel="import" href="../lifetime_browser_proxy.html"> |
7 <link rel="import" href="../prefs/prefs.html"> | 7 <link rel="import" href="../prefs/prefs.html"> |
8 <link rel="import" href="../settings_shared_css.html"> | 8 <link rel="import" href="../settings_shared_css.html"> |
9 <link rel="import" href="system_page_browser_proxy.html"> | 9 <link rel="import" href="system_page_browser_proxy.html"> |
10 | 10 |
(...skipping 15 matching lines...) Expand all Loading... |
26 <template is="dom-if" if="[[shouldShowRestart_( | 26 <template is="dom-if" if="[[shouldShowRestart_( |
27 prefs.hardware_acceleration_mode.enabled.value)]]"> | 27 prefs.hardware_acceleration_mode.enabled.value)]]"> |
28 <paper-button on-tap="onRestartTap_" class="more-actions"> | 28 <paper-button on-tap="onRestartTap_" class="more-actions"> |
29 $i18n{restart} | 29 $i18n{restart} |
30 </paper-button> | 30 </paper-button> |
31 </template> | 31 </template> |
32 </settings-toggle-button> | 32 </settings-toggle-button> |
33 </div> | 33 </div> |
34 <div class="settings-box"> | 34 <div class="settings-box"> |
35 <controlled-button class="primary-button" pref="[[prefs.proxy]]" | 35 <controlled-button class="primary-button" pref="[[prefs.proxy]]" |
36 on-tap="onChangeProxySettingsTap_" ignore-extensions> | 36 on-tap="onChangeProxySettingsTap_" no-extension-indicator> |
37 $i18n{changeProxySettings} | 37 $i18n{changeProxySettings} |
38 </controlled-button> | 38 </controlled-button> |
39 </div> | 39 </div> |
40 <template is="dom-if" if="[[prefs.proxy.extensionId]]"> | 40 <template is="dom-if" if="[[prefs.proxy.extensionId]]"> |
41 <div class="settings-box continuation"> | 41 <div class="settings-box continuation"> |
42 <extension-controlled-indicator class="start" | 42 <extension-controlled-indicator class="start" |
43 extension-id="[[prefs.proxy.extensionId]]" | 43 extension-id="[[prefs.proxy.extensionId]]" |
44 extension-name="[[prefs.proxy.controlledByName]]" | 44 extension-name="[[prefs.proxy.controlledByName]]" |
45 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]" | 45 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]" |
46 on-extension-disable="onExtensionDisable_"> | 46 on-extension-disable="onExtensionDisable_"> |
47 </extension-controlled-indicator> | 47 </extension-controlled-indicator> |
48 </div> | 48 </div> |
49 </template> | 49 </template> |
50 </template> | 50 </template> |
51 <script src="system_page.js"></script> | 51 <script src="system_page.js"></script> |
52 </dom-module> | 52 </dom-module> |
OLD | NEW |