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