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/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/shared_style.html"> | |
| 9 | 10 |
| 10 <dom-module id="history-list-container"> | 11 <dom-module id="history-list-container"> |
| 11 <template> | 12 <template> |
| 12 <style include="cr-shared-style"> | 13 <style include="shared-style cr-shared-style"> |
| 13 :host { | 14 :host { |
| 14 display: block; | 15 display: block; |
| 15 height: 100%; | 16 height: 100%; |
| 16 overflow: hidden; | 17 overflow: hidden; |
| 17 } | 18 } |
| 18 | 19 |
| 19 #content, | 20 #content, |
| 20 #content > * { | 21 #content > * { |
| 21 height: 100%; | 22 height: 100%; |
| 22 } | 23 } |
| 23 | 24 |
| 24 #dialog .body { | 25 #dialog .body { |
| 25 white-space: pre-wrap; | 26 white-space: pre-wrap; |
| 26 } | 27 } |
| 27 | 28 |
| 28 paper-item { | 29 paper-item { |
| 29 -webkit-user-select: none; | 30 -webkit-user-select: none; |
| 30 cursor: pointer; | 31 cursor: pointer; |
| 31 font: inherit; | 32 font: inherit; |
| 32 white-space: nowrap; | 33 white-space: nowrap; |
| 33 } | 34 } |
|
calamity
2016/08/04 07:30:05
Can we remove this then?
tsergeant
2016/08/05 02:40:02
Done.
| |
| 34 </style> | 35 </style> |
| 35 <iron-pages id="content" attr-for-selected="id" | 36 <iron-pages id="content" attr-for-selected="id" |
| 36 selected="[[selectedPage_]]"> | 37 selected="[[selectedPage_]]"> |
| 37 <history-list id="infinite-list" querying="[[queryState.querying]]" | 38 <history-list id="infinite-list" querying="[[queryState.querying]]" |
| 38 searched-term="[[queryResult.info.term]]"></history-list> | 39 searched-term="[[queryResult.info.term]]"></history-list> |
| 39 <template is="dom-if" if="[[grouped]]"> | 40 <template is="dom-if" if="[[grouped]]"> |
| 40 <history-grouped-list id="grouped-list" | 41 <history-grouped-list id="grouped-list" |
| 41 range="[[queryState.range]]" | 42 range="[[queryState.range]]" |
| 42 query-start-time="[[queryResult.info.queryStartTime]]" | 43 query-start-time="[[queryResult.info.queryStartTime]]" |
| 43 query-end-time="[[queryResult.info.queryEndTime]]" | 44 query-end-time="[[queryResult.info.queryEndTime]]" |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 54 $i18n{cancel} | 55 $i18n{cancel} |
| 55 </paper-button> | 56 </paper-button> |
| 56 <paper-button class="action-button" on-tap="onDialogConfirmTap_" | 57 <paper-button class="action-button" on-tap="onDialogConfirmTap_" |
| 57 autofocus> | 58 autofocus> |
| 58 $i18n{deleteConfirm} | 59 $i18n{deleteConfirm} |
| 59 </paper-button> | 60 </paper-button> |
| 60 </div> | 61 </div> |
| 61 </dialog> | 62 </dialog> |
| 62 | 63 |
| 63 <cr-shared-menu id="sharedMenu"> | 64 <cr-shared-menu id="sharedMenu"> |
| 64 <paper-item id="menuMoreButton" on-tap="onMoreFromSiteTap_"> | 65 <paper-item id="menuMoreButton" class="menu-item" |
| 66 on-tap="onMoreFromSiteTap_"> | |
| 65 $i18n{moreFromSite} | 67 $i18n{moreFromSite} |
| 66 </paper-item> | 68 </paper-item> |
| 67 <paper-item id="menuRemoveButton" on-tap="onRemoveFromHistoryTap_"> | 69 <paper-item id="menuRemoveButton" class="menu-item" |
| 70 on-tap="onRemoveFromHistoryTap_"> | |
| 68 $i18n{removeFromHistory} | 71 $i18n{removeFromHistory} |
| 69 </paper-item> | 72 </paper-item> |
| 70 </cr-shared-menu> | 73 </cr-shared-menu> |
| 71 </template> | 74 </template> |
| 72 <script src="chrome://history/list_container.js"></script> | 75 <script src="chrome://history/list_container.js"></script> |
| 73 </dom-module> | 76 </dom-module> |
| OLD | NEW |