Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3172)

Unified Diff: chrome/browser/resources/settings/default_browser_page/default_browser_page.html

Issue 2317693003: [MD settings] display message about secondary install in default browser settings (Closed)
Patch Set: excluding from chromeos Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..372f9df333f54fe14b4c8a17d6631e395f243c56 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,41 @@
<link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
+<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="[[maySetDefaultBrowser_]]">
+ <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="[[!maySetDefaultBrowser_]]">
+ <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>

Powered by Google App Engine
This is Rietveld 408576698