Chromium Code Reviews| 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/html/web_ui_listener_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 3 <link rel="import" href="default_browser_browser_proxy.html"> | 3 <link rel="import" href="default_browser_browser_proxy.html"> |
| 4 <link rel="import" href="../icons.html"> | 4 <link rel="import" href="../icons.html"> |
| 5 <link rel="import" href="../settings_shared_css.html"> | 5 <link rel="import" href="../settings_shared_css.html"> |
| 6 | 6 |
| 7 <dom-module id="settings-default-browser-page"> | 7 <dom-module id="settings-default-browser-page"> |
| 8 <template> | 8 <template> |
| 9 <style include="settings-shared"> | 9 <style include="settings-shared"> |
| 10 .solo-secondary { | |
| 11 @apply(--settings-secondary); | |
| 12 margin: 0; | |
| 13 } | |
| 14 </style> | 10 </style> |
| 15 <template is="dom-if" if="[[maySetDefaultBrowser_]]"> | 11 <template is="dom-if" if="[[maySetDefaultBrowser_]]"> |
| 16 <div class="settings-box first two-line"> | 12 <div class="settings-box first two-line"> |
| 17 <div class="start"> | 13 <div class="start"> |
| 18 <div id="canBeDefaultBrowser">$i18n{defaultBrowser}</div> | 14 <div id="canBeDefaultBrowser">$i18n{defaultBrowser}</div> |
| 19 <div class="secondary">$i18n{defaultBrowserMakeDefault}</div> | 15 <div class="secondary">$i18n{defaultBrowserMakeDefault}</div> |
| 20 </div> | 16 </div> |
| 21 <div class="secondary-action"> | 17 <div class="secondary-action"> |
| 22 <paper-button class="secondary-button" | 18 <paper-button class="secondary-button" |
| 23 on-tap="onSetDefaultBrowserTap_"> | 19 on-tap="onSetDefaultBrowserTap_"> |
| 24 $i18n{defaultBrowserMakeDefaultButton} | 20 $i18n{defaultBrowserMakeDefaultButton} |
| 25 </paper-button> | 21 </paper-button> |
| 26 </div> | 22 </div> |
| 27 </div> | 23 </div> |
| 28 </template> | 24 </template> |
| 29 <template is="dom-if" if="[[!maySetDefaultBrowser_]]"> | 25 <template is="dom-if" if="[[!maySetDefaultBrowser_]]"> |
| 30 <div class="settings-box first"> | 26 <div class="settings-box first"> |
| 31 <div class="solo-secondary start" hidden$="[[!isDefault_]]" | 27 <div class="start" hidden$="[[!isDefault_]]" |
| 32 id="isDefault"> | 28 id="isDefault"> |
|
dpapad
2017/03/16 18:41:01
Nit: Does this fit in previous line now? Same ques
scottchen
2017/03/16 18:56:25
Not the second one, but did fix its indentation is
| |
| 33 $i18n{defaultBrowserDefault} | 29 $i18n{defaultBrowserDefault} |
| 34 </div> | 30 </div> |
| 35 <div class="solo-secondary start" hidden$="[[!isSecondaryInstall_]]" | 31 <div class="start" hidden$="[[!isSecondaryInstall_]]" |
| 36 id="isSecondaryInstall"> | 32 id="isSecondaryInstall"> |
| 37 $i18n{defaultBrowserSecondary} | 33 $i18n{defaultBrowserSecondary} |
| 38 </div> | 34 </div> |
| 39 <div class="solo-secondary start" hidden$="[[!isUnknownError_]]" | 35 <div class="start" hidden$="[[!isUnknownError_]]" |
| 40 id="isUnknownError"> | 36 id="isUnknownError"> |
| 41 $i18n{defaultBrowserError} | 37 $i18n{defaultBrowserError} |
| 42 </div> | 38 </div> |
| 43 </div> | 39 </div> |
| 44 </template> | 40 </template> |
| 45 </template> | 41 </template> |
| 46 <script src="default_browser_page.js"></script> | 42 <script src="default_browser_page.js"></script> |
| 47 </dom-module> | 43 </dom-module> |
| OLD | NEW |