Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 7 <link rel="import" href="/i18n_setup.html"> | 7 <link rel="import" href="/i18n_setup.html"> |
| 8 <link rel="import" href="/icons.html"> | 8 <link rel="import" href="/icons.html"> |
| 9 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
| 10 <link rel="import" href="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 59 | 59 |
| 60 <div class="list-frame" hidden$="[[hasSites_(sites)]]"> | 60 <div class="list-frame" hidden$="[[hasSites_(sites)]]"> |
| 61 <div class="list-item secondary">$i18n{noSitesAdded}</div> | 61 <div class="list-item secondary">$i18n{noSitesAdded}</div> |
| 62 </div> | 62 </div> |
| 63 <div class="list-frame menu-content vertical-list" id="listContainer"> | 63 <div class="list-frame menu-content vertical-list" id="listContainer"> |
| 64 <template is="dom-repeat" items="[[sites]]"> | 64 <template is="dom-repeat" items="[[sites]]"> |
| 65 <div class="list-item"> | 65 <div class="list-item"> |
| 66 <div class="start layout horizontal center" on-tap="onOriginTap_" | 66 <div class="start layout horizontal center" on-tap="onOriginTap_" |
| 67 actionable$="[[enableSiteSettings_]]"> | 67 actionable$="[[enableSiteSettings_]]"> |
| 68 <div class="favicon-image" | 68 <div class="favicon-image" |
| 69 style$="[[computeSiteIcon(item.originForDisplay)]]"> | 69 style$="[[computeSiteIcon(item.origin)]]"> |
|
dschuyler
2016/11/28 21:58:42
I'm not clear on why this change was made origin r
dullweber
2016/11/29 09:34:18
In case of extensions, the originForDisplay is now
dschuyler
2016/11/29 22:46:59
I like the variable label of |displayName| used el
| |
| 70 </div> | 70 </div> |
| 71 <div class="middle"> | 71 <div class="middle"> |
| 72 <div class="selectable">[[item.originForDisplay]]</div> | 72 <div class="selectable">[[item.originForDisplay]]</div> |
| 73 | 73 |
| 74 <!-- This div must not contain extra whitespace. --> | 74 <!-- This div must not contain extra whitespace. --> |
| 75 <div class="selectable secondary" | 75 <div class="selectable secondary" |
| 76 >[[computeSiteDescription_(item)]]</div> | 76 >[[computeSiteDescription_(item)]]</div> |
| 77 </div> | 77 </div> |
| 78 </div> | 78 </div> |
| 79 | 79 |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 91 </button> | 91 </button> |
| 92 </div> | 92 </div> |
| 93 </template> | 93 </template> |
| 94 </div> | 94 </div> |
| 95 </template> | 95 </template> |
| 96 </div> | 96 </div> |
| 97 </div> | 97 </div> |
| 98 </template> | 98 </template> |
| 99 <script src="site_list.js"></script> | 99 <script src="site_list.js"></script> |
| 100 </dom-module> | 100 </dom-module> |
| OLD | NEW |