| 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/history_toolbar.html"> | 3 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 4 <link rel="import" href="chrome://history/list_container.html"> | 4 <link rel="import" href="chrome://history/list_container.html"> |
| 5 <link rel="import" href="chrome://history/synced_device_manager.html"> | 5 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 6 <link rel="import" href="chrome://history/side_bar.html"> | 6 <link rel="import" href="chrome://history/side_bar.html"> |
| 7 <link rel="import" href="chrome://history/shared_style.html"> | 7 <link rel="import" href="chrome://history/shared_style.html"> |
| 8 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 8 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
| 9 | 9 |
| 10 <dom-module id="history-app"> | 10 <dom-module id="history-app"> |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 height: 100%; | 36 height: 100%; |
| 37 } | 37 } |
| 38 </style> | 38 </style> |
| 39 <history-toolbar id="toolbar" | 39 <history-toolbar id="toolbar" |
| 40 spinner-active="[[shouldShowSpinner_(queryState_.querying, | 40 spinner-active="[[shouldShowSpinner_(queryState_.querying, |
| 41 queryState_.incremental, | 41 queryState_.incremental, |
| 42 queryState_.searchTerm)]]" | 42 queryState_.searchTerm)]]" |
| 43 is-grouped-mode="{{grouped_}}" | 43 is-grouped-mode="{{grouped_}}" |
| 44 grouped-range="{{queryState_.range}}" | 44 grouped-range="{{queryState_.range}}" |
| 45 search-term="{{queryState_.searchTerm}}" | 45 search-term="{{queryState_.searchTerm}}" |
| 46 query-start-time="[[queryState_.info.queryStartTime]]" | 46 query-start-time="[[queryResult_.info.queryStartTime]]" |
| 47 query-end-time="[[queryState_.info.queryEndTime]]"> | 47 query-end-time="[[queryResult_.info.queryEndTime]]"> |
| 48 </history-toolbar> | 48 </history-toolbar> |
| 49 | 49 |
| 50 <div id="main-container"> | 50 <div id="main-container"> |
| 51 <iron-pages id="content" attr-for-selected="id" | 51 <iron-pages id="content" attr-for-selected="id" |
| 52 selected="[[selectedPage_]]"> | 52 selected="[[selectedPage_]]"> |
| 53 <history-list-container id="history" query-state="[[queryState_]]" | 53 <history-list-container id="history" query-state="[[queryState_]]" |
| 54 grouped="[[grouped_]]"></history-list-container> | 54 query-result="[[queryResult_]]" grouped="[[grouped_]]"> |
| 55 </history-list-container> |
| 55 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 56 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
| 56 <history-synced-device-manager id="synced-devices" | 57 <history-synced-device-manager id="synced-devices" |
| 57 session-list="[[sessionList]]" | 58 session-list="[[queryResult_.sessionList]]" |
| 58 searched-term=[[queryState_.info.term]]> | 59 searched-term=[[queryState_.searchTerm]]> |
| 59 </history-synced-device-manager> | 60 </history-synced-device-manager> |
| 60 </template> | 61 </template> |
| 61 </iron-pages> | 62 </iron-pages> |
| 62 </div> | 63 </div> |
| 63 | 64 |
| 64 <history-side-bar id="side-bar" selected-page="{{selectedPage_}}"> | 65 <history-side-bar id="side-bar" selected-page="{{selectedPage_}}"> |
| 65 </history-side-bar> | 66 </history-side-bar> |
| 66 </template> | 67 </template> |
| 67 <script src="chrome://history/app.js"></script> | 68 <script src="chrome://history/app.js"></script> |
| 68 </dom-module> | 69 </dom-module> |
| OLD | NEW |