| 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/polymer/v1_0/iron-pages/iron-pages.h
tml"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> |
| 3 <link rel="import" href="chrome://history/grouped_list.html"> | |
| 4 <link rel="import" href="chrome://history/history_list.html"> | |
| 5 <link rel="import" href="chrome://history/history_toolbar.html"> | 3 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 4 <link rel="import" href="chrome://history/list_container.html"> |
| 6 <link rel="import" href="chrome://history/synced_device_manager.html"> | 5 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 7 <link rel="import" href="chrome://history/side_bar.html"> | 6 <link rel="import" href="chrome://history/side_bar.html"> |
| 8 <link rel="import" href="chrome://history/shared_style.html"> | 7 <link rel="import" href="chrome://history/shared_style.html"> |
| 9 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 8 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
| 10 | 9 |
| 11 <dom-module id="history-app"> | 10 <dom-module id="history-app"> |
| 12 <!-- TODO(calamity): work around this deprecated import style --> | |
| 13 <template> | 11 <template> |
| 14 <style no-process> | 12 <style no-process> |
| 15 history-toolbar { | 13 history-toolbar { |
| 16 background: var(--md-toolbar-color); | 14 background: var(--md-toolbar-color); |
| 17 } | 15 } |
| 18 </style> | 16 </style> |
| 19 <style include="shared-style"> | 17 <style include="shared-style"> |
| 20 :host { | 18 :host { |
| 21 display: block; | 19 display: block; |
| 22 height: 100%; | 20 height: 100%; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 44 queryState_.searchTerm)]]" | 42 queryState_.searchTerm)]]" |
| 45 is-grouped-mode="{{grouped_}}" | 43 is-grouped-mode="{{grouped_}}" |
| 46 grouped-range="{{queryState_.range}}" | 44 grouped-range="{{queryState_.range}}" |
| 47 search-term="{{queryState_.searchTerm}}" | 45 search-term="{{queryState_.searchTerm}}" |
| 48 query-start-time="[[queryState_.info.queryStartTime]]" | 46 query-start-time="[[queryState_.info.queryStartTime]]" |
| 49 query-end-time="[[queryState_.info.queryEndTime]]"> | 47 query-end-time="[[queryState_.info.queryEndTime]]"> |
| 50 </history-toolbar> | 48 </history-toolbar> |
| 51 | 49 |
| 52 <div id="main-container"> | 50 <div id="main-container"> |
| 53 <iron-pages id="content" attr-for-selected="id" | 51 <iron-pages id="content" attr-for-selected="id" |
| 54 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]"> | 52 selected="[[selectedPage_]]"> |
| 55 <history-list id="history-list" querying="[[queryState_.querying]]" | 53 <history-list-container id="history" query-state="[[queryState_]]" |
| 56 searched-term="[[queryState_.info.term]]"></history-list> | 54 grouped="[[grouped_]]"></history-list-container> |
| 57 <template is="dom-if" if="[[grouped_]]"> | |
| 58 <history-grouped-list id="history-grouped-list" | |
| 59 range="[[queryState_.range]]" | |
| 60 query-start-time="[[queryState_.info.queryStartTime]]" | |
| 61 query-end-time="[[queryState_.info.queryEndTime]]" | |
| 62 searched-term="[[queryState_.info.term]]"> | |
| 63 </history-grouped-list> | |
| 64 </template> | |
| 65 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 55 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
| 66 <history-synced-device-manager id="history-synced-device-manager" | 56 <history-synced-device-manager id="synced-devices" |
| 67 session-list="[[queryState_.sessionList]]" | 57 session-list="[[sessionList]]" |
| 68 searched-term=[[queryState_.info.term]]> | 58 searched-term=[[queryState_.info.term]]> |
| 69 </history-synced-device-manager> | 59 </history-synced-device-manager> |
| 70 </template> | 60 </template> |
| 71 </iron-pages> | 61 </iron-pages> |
| 72 </div> | 62 </div> |
| 73 | 63 |
| 74 <history-side-bar id="side-bar" selected-page="{{selectedPage_}}"> | 64 <history-side-bar id="side-bar" selected-page="{{selectedPage_}}"> |
| 75 </history-side-bar> | 65 </history-side-bar> |
| 76 </template> | 66 </template> |
| 77 <script src="chrome://history/app.js"></script> | 67 <script src="chrome://history/app.js"></script> |
| 78 </dom-module> | 68 </dom-module> |
| OLD | NEW |