Chromium Code Reviews| Index: chrome/browser/resources/settings/default_browser_page/default_browser_page.html |
| diff --git a/chrome/browser/resources/settings/default_browser_page/default_browser_page.html b/chrome/browser/resources/settings/default_browser_page/default_browser_page.html |
| index f4e856029d75b7608e2bfbe485dd452a2d76998a..4ab9a5a9364a857ac047294e61f4dde09670b3a0 100644 |
| --- a/chrome/browser/resources/settings/default_browser_page/default_browser_page.html |
| +++ b/chrome/browser/resources/settings/default_browser_page/default_browser_page.html |
| @@ -1,31 +1,43 @@ |
| <link rel="import" href="chrome://resources/html/polymer.html"> |
| +<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> |
|
Finnur
2016/09/07 16:25:22
This can go now, it seems.
dschuyler
2016/09/07 18:51:42
Done.
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> |
|
Finnur
2016/09/07 16:25:22
What is this for?
dschuyler
2016/09/07 18:51:42
Done.
|
| +<link rel="import" href="/default_browser_page/default_browser_browser_proxy.html"> |
| <link rel="import" href="/icons.html"> |
| <link rel="import" href="/settings_shared_css.html"> |
| <dom-module id="settings-default-browser-page"> |
| <template> |
| <style include="settings-shared"> |
| - .error-icon { |
| - color: var(--settings-error-color); |
| + .solo-secondary { |
| + @apply(--settings-secondary); |
| + margin: 0; |
| } |
| </style> |
| - <div class="settings-box first two-line"> |
| - <template is="dom-if" if="[[showButton_]]"> |
| - <div class="start" on-tap="onSetDefaultBrowserTap_" actionable> |
| - <div>$i18n{defaultBrowser}</div> |
| + <template is="dom-if" if="[[showButton_]]"> |
| + <div class="settings-box first two-line" on-tap="onSetDefaultBrowserTap_" |
| + actionable> |
| + <div> |
| + <div id="canBeDefaultBrowser">$i18n{defaultBrowser}</div> |
| <div class="secondary">$i18n{defaultBrowserMakeDefault}</div> |
| </div> |
| - <template is="dom-if" if="[[showError_]]"> |
| - <iron-icon icon="settings:error" class="error-icon" |
| - title="$i18n{unableToSetDefaultBrowser}"></iron-icon> |
| - </template> |
| - </template> |
| - <template is="dom-if" if="[[!showButton_]]"> |
| - <div class="secondary">[[message_]]</div> |
| - </template> |
| - </div> |
| + </div> |
| + </template> |
| + <template is="dom-if" if="[[!showButton_]]"> |
|
Finnur
2016/09/07 16:25:22
Button? Which button?
dschuyler
2016/09/07 18:51:42
Done.
|
| + <div class="settings-box first"> |
| + <div class="solo-secondary" hidden$="[[!isDefault_]]" id="isDefault"> |
| + $i18n{defaultBrowserDefault} |
| + </div> |
| + <div class="solo-secondary" hidden$="[[!isSecondaryInstall_]]" |
| + id="isSecondaryInstall"> |
| + $i18n{defaultBrowserSecondary} |
| + </div> |
| + <div class="solo-secondary" hidden$="[[!isUnknownError_]]" |
| + id="isUnknownError"> |
| + $i18n{defaultBrowserError} |
| + </div> |
| + </div> |
| + </template> |
| </template> |
| <script src="default_browser_page.js"></script> |
| </dom-module> |