| 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/cr_elements/cr_dialog/cr_dialog.html
"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/cr_shared_menu/cr_shared
_menu.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/cr_shared_menu/cr_shared
_menu.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h
tml"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h
tml"> |
| 7 <link rel="import" href="chrome://history/grouped_list.html"> | 7 <link rel="import" href="chrome://history/grouped_list.html"> |
| 8 <link rel="import" href="chrome://history/history_list.html"> | 8 <link rel="import" href="chrome://history/history_list.html"> |
| 9 <link rel="import" href="chrome://history/lazy_render.html"> |
| 9 <link rel="import" href="chrome://history/shared_style.html"> | 10 <link rel="import" href="chrome://history/shared_style.html"> |
| 10 | 11 |
| 11 <dom-module id="history-list-container"> | 12 <dom-module id="history-list-container"> |
| 12 <template> | 13 <template> |
| 13 <style include="shared-style cr-shared-style"> | 14 <style include="shared-style cr-shared-style"> |
| 14 :host { | 15 :host { |
| 15 display: block; | 16 display: block; |
| 16 height: 100%; | 17 height: 100%; |
| 17 overflow: hidden; | 18 overflow: hidden; |
| 18 } | 19 } |
| 19 | 20 |
| 20 #content, | 21 #content, |
| 21 #content > * { | 22 #content > * { |
| 22 height: 100%; | 23 height: 100%; |
| 23 } | 24 } |
| 24 | 25 |
| 25 #dialog .body { | 26 dialog .body { |
| 26 white-space: pre-wrap; | 27 white-space: pre-wrap; |
| 27 } | 28 } |
| 28 </style> | 29 </style> |
| 29 <iron-pages id="content" attr-for-selected="id" | 30 <iron-pages id="content" attr-for-selected="id" |
| 30 selected="[[selectedPage_]]"> | 31 selected="[[selectedPage_]]"> |
| 31 <history-list id="infinite-list" querying="[[queryState.querying]]" | 32 <history-list id="infinite-list" querying="[[queryState.querying]]" |
| 32 searched-term="[[queryResult.info.term]]"></history-list> | 33 searched-term="[[queryResult.info.term]]"></history-list> |
| 33 <template is="dom-if" if="[[grouped]]"> | 34 <template is="dom-if" if="[[grouped]]"> |
| 34 <history-grouped-list id="grouped-list" | 35 <history-grouped-list id="grouped-list" |
| 35 range="[[queryState.range]]" | 36 range="[[queryState.range]]" |
| 36 query-start-time="[[queryResult.info.queryStartTime]]" | 37 query-start-time="[[queryResult.info.queryStartTime]]" |
| 37 query-end-time="[[queryResult.info.queryEndTime]]" | 38 query-end-time="[[queryResult.info.queryEndTime]]" |
| 38 searched-term="[[queryResult.info.term]]"> | 39 searched-term="[[queryResult.info.term]]"> |
| 39 </history-grouped-list> | 40 </history-grouped-list> |
| 40 </template> | 41 </template> |
| 41 </iron-pages> | 42 </iron-pages> |
| 42 | 43 |
| 43 <dialog is="cr-dialog" id="dialog"> | 44 <template is="history-lazy-render" id="dialog"> |
| 44 <div class="title">$i18n{removeSelected}</div> | 45 <dialog is="cr-dialog"> |
| 45 <div class="body">$i18n{deleteWarning}</div> | 46 <div class="title">$i18n{removeSelected}</div> |
| 46 <div class="button-container"> | 47 <div class="body">$i18n{deleteWarning}</div> |
| 47 <paper-button class="cancel-button" on-tap="onDialogCancelTap_"> | 48 <div class="button-container"> |
| 48 $i18n{cancel} | 49 <paper-button class="cancel-button" on-tap="onDialogCancelTap_"> |
| 49 </paper-button> | 50 $i18n{cancel} |
| 50 <paper-button class="action-button" on-tap="onDialogConfirmTap_" | 51 </paper-button> |
| 51 autofocus> | 52 <paper-button class="action-button" on-tap="onDialogConfirmTap_" |
| 52 $i18n{deleteConfirm} | 53 autofocus> |
| 53 </paper-button> | 54 $i18n{deleteConfirm} |
| 54 </div> | 55 </paper-button> |
| 55 </dialog> | 56 </div> |
| 57 </dialog> |
| 58 </template> |
| 56 | 59 |
| 57 <cr-shared-menu id="sharedMenu"> | 60 <template is="history-lazy-render" id="sharedMenu"> |
| 58 <paper-item id="menuMoreButton" class="menu-item" | 61 <cr-shared-menu> |
| 59 on-tap="onMoreFromSiteTap_"> | 62 <paper-item id="menuMoreButton" class="menu-item" |
| 60 $i18n{moreFromSite} | 63 on-tap="onMoreFromSiteTap_"> |
| 61 </paper-item> | 64 $i18n{moreFromSite} |
| 62 <paper-item id="menuRemoveButton" class="menu-item" | 65 </paper-item> |
| 63 on-tap="onRemoveFromHistoryTap_"> | 66 <paper-item id="menuRemoveButton" class="menu-item" |
| 64 $i18n{removeFromHistory} | 67 on-tap="onRemoveFromHistoryTap_"> |
| 65 </paper-item> | 68 $i18n{removeFromHistory} |
| 66 </cr-shared-menu> | 69 </paper-item> |
| 70 </cr-shared-menu> |
| 71 </template> |
| 67 </template> | 72 </template> |
| 68 <script src="chrome://history/list_container.js"></script> | 73 <script src="chrome://history/list_container.js"></script> |
| 69 </dom-module> | 74 </dom-module> |
| OLD | NEW |