Chromium Code Reviews| Index: chrome/browser/resources/md_history/history_list.html |
| diff --git a/chrome/browser/resources/md_history/history_card_manager.html b/chrome/browser/resources/md_history/history_list.html |
| similarity index 62% |
| rename from chrome/browser/resources/md_history/history_card_manager.html |
| rename to chrome/browser/resources/md_history/history_list.html |
| index 7108a87abc6593da7befccbd5ac3cc9501c978e2..15a2bee92b9cf484a7a8e1fdb7285bb3ba088c67 100644 |
| --- a/chrome/browser/resources/md_history/history_card_manager.html |
| +++ b/chrome/browser/resources/md_history/history_list.html |
| @@ -3,9 +3,9 @@ |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.html"> |
| <link rel="import" href="chrome://resources/html/cr/ui/position_util.html"> |
| -<link rel="import" href="chrome://history/history_card.html"> |
| +<link rel="import" href="chrome://history/history_item.html"> |
| -<dom-module id="history-card-manager"> |
| +<dom-module id="history-list"> |
| <template> |
| <style> |
| :host { |
| @@ -13,10 +13,6 @@ |
| flex-direction: column; |
| } |
| - :host([menu-open]) #overflow-menu { |
| - display: block; |
| - } |
| - |
| #overflow-menu { |
| @apply(--shadow-elevation-2dp); |
| border-radius: 2px; |
| @@ -26,9 +22,13 @@ |
| top: 0; |
| } |
| + :host([menu-open]) #overflow-menu { |
| + display: block; |
| + } |
| + |
| #infinite-list { |
| flex: 1; |
| - padding: 40px 0 0 0; |
| + padding: 20px 0 0 0; |
| } |
| paper-item { |
| @@ -41,12 +41,21 @@ |
| background: #eaeaea; |
| } |
| </style> |
| - <iron-list items="{{historyDataByDay_}}" as="historyDay" id="infinite-list" |
| + <iron-list items="{{historyData}}" as="historyDay" id="infinite-list" |
| on-scroll="scrollHandler_"> |
| <template> |
| - <history-card history-date="{{historyDay.date}}" |
| - history-items="{{historyDay.historyItems}}"> |
| - </history-card> |
| + <history-item history-date="[[historyDay.dateRelativeDay]]" |
| + website-title="[[historyDay.title]]" |
| + website-url="[[historyDay.url]]" |
| + website-domain="[[historyDay.domain]]" |
| + time-accessed="[[historyDay.dateTimeOfDay]]" |
| + starred="[[historyDay.starred]]" |
| + timestamp="[[historyDay.time]]" |
| + selected="{{historyDay.selected}}" |
| + is-card-start="{{historyDay.isFirstItem}}" |
|
tsergeant
2016/02/02 23:47:33
Can these be one-way bound?
yingran
2016/02/04 02:13:42
Done.
|
| + is-last-card="{{historyDay.isLastItem}}" |
| + has-time-gap="{{historyDay.needsTimeGap}}"> |
| + </history-item> |
| </template> |
| </iron-list> |
| <paper-menu id="overflow-menu"> |
| @@ -57,5 +66,5 @@ |
| </paper-item> |
| </paper-menu> |
| </template> |
| - <script src="chrome://history/history_card_manager.js"></script> |
| + <script src="chrome://history/history_list.js"></script> |
| </dom-module> |