| Index: chrome/browser/resources/settings/system_page/system_page.html
|
| diff --git a/chrome/browser/resources/settings/system_page/system_page.html b/chrome/browser/resources/settings/system_page/system_page.html
|
| index 530b7c60927163c0872a251cde047af49ced367c..28e5102d19990b7192e2a51b9d3a7ad55910a54f 100644
|
| --- a/chrome/browser/resources/settings/system_page/system_page.html
|
| +++ b/chrome/browser/resources/settings/system_page/system_page.html
|
| @@ -1,5 +1,6 @@
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
|
| <link rel="import" href="/controls/controlled_button.html">
|
| <link rel="import" href="/controls/settings_checkbox.html">
|
| <link rel="import" href="/lifetime_browser_proxy.html">
|
| @@ -37,11 +38,18 @@
|
| </template>
|
| </div>
|
| </div>
|
| - <div class="settings-box">
|
| - <controlled-button class="primary-button" pref="[[prefs.proxy]]"
|
| - on-tap="onChangeProxySettingsTap_">
|
| + <div class="settings-box two-line" on-tap="onChangeProxySettingsTap_"
|
| + actionable>
|
| + <div class="start">
|
| $i18n{changeProxySettings}
|
| + <div class="secondary">$i18n{changeProxySettingsSubtext}</div>
|
| + </div>
|
| + <!-- TODO(dschuyler): This controlled-button should be replaced with
|
| + something that shows the controlled icon without being a button. -->
|
| + <controlled-button pref="[[prefs.proxy]]">
|
| </controlled-button>
|
| + <button class="icon-external" is="paper-icon-button-light">
|
| + </button>
|
| </div>
|
| </template>
|
| <script src="/system_page/system_page.js"></script>
|
|
|