| 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"> | 3 <link rel="import" href="chrome://history/grouped_list.html"> |
| 4 <link rel="import" href="chrome://history/history_list.html"> | 4 <link rel="import" href="chrome://history/history_list.html"> |
| 5 <link rel="import" href="chrome://history/history_toolbar.html"> | 5 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 6 <link rel="import" href="chrome://history/synced_device_manager.html"> | 6 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 7 <link rel="import" href="chrome://history/side_bar.html"> | 7 <link rel="import" href="chrome://history/side_bar.html"> |
| 8 <link rel="import" href="chrome://history/shared_style.html"> | 8 <link rel="import" href="chrome://history/shared_style.html"> |
| 9 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 9 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
| 10 | 10 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 queryState_.incremental, | 48 queryState_.incremental, |
| 49 queryState_.searchTerm)]]" | 49 queryState_.searchTerm)]]" |
| 50 is-grouped-mode="{{grouped_}}" | 50 is-grouped-mode="{{grouped_}}" |
| 51 grouped-range="{{queryState_.range}}" | 51 grouped-range="{{queryState_.range}}" |
| 52 search-term="{{queryState_.searchTerm}}" | 52 search-term="{{queryState_.searchTerm}}" |
| 53 query-start-time="[[queryState_.info.queryStartTime]]" | 53 query-start-time="[[queryState_.info.queryStartTime]]" |
| 54 query-end-time="[[queryState_.info.queryEndTime]]"> | 54 query-end-time="[[queryState_.info.queryEndTime]]"> |
| 55 </history-toolbar> | 55 </history-toolbar> |
| 56 | 56 |
| 57 <div id="main-container"> | 57 <div id="main-container"> |
| 58 <history-side-bar id="history-side-bar" selected-page="{{selectedPage_}}"> | 58 <history-side-bar id="history-side-bar" selected-page="{{selectedPage_}}" |
| 59 show-footer="[[showFooter]]"> |
| 59 </history-side-bar> | 60 </history-side-bar> |
| 60 <iron-pages id="content" attr-for-selected="id" | 61 <iron-pages id="content" attr-for-selected="id" |
| 61 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]"> | 62 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]"> |
| 62 <history-list id="history-list" querying="[[queryState_.querying]]" | 63 <history-list id="history-list" querying="[[queryState_.querying]]" |
| 63 searched-term="[[queryState_.info.term]]"></history-list> | 64 searched-term="[[queryState_.info.term]]"></history-list> |
| 64 <template is="dom-if" if="[[grouped_]]"> | 65 <template is="dom-if" if="[[grouped_]]"> |
| 65 <history-grouped-list id="history-grouped-list" | 66 <history-grouped-list id="history-grouped-list" |
| 66 range="[[queryState_.range]]" | 67 range="[[queryState_.range]]" |
| 67 query-start-time="[[queryState_.info.queryStartTime]]" | 68 query-start-time="[[queryState_.info.queryStartTime]]" |
| 68 query-end-time="[[queryState_.info.queryEndTime]]" | 69 query-end-time="[[queryState_.info.queryEndTime]]" |
| 69 searched-term="[[queryState_.info.term]]"> | 70 searched-term="[[queryState_.info.term]]"> |
| 70 </history-grouped-list> | 71 </history-grouped-list> |
| 71 </template> | 72 </template> |
| 72 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 73 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
| 73 <history-synced-device-manager id="history-synced-device-manager" | 74 <history-synced-device-manager id="history-synced-device-manager" |
| 74 session-list="[[queryState_.sessionList]]" | 75 session-list="[[queryState_.sessionList]]" |
| 75 searched-term=[[queryState_.info.term]]> | 76 searched-term=[[queryState_.info.term]]> |
| 76 </history-synced-device-manager> | 77 </history-synced-device-manager> |
| 77 </template> | 78 </template> |
| 78 </iron-pages> | 79 </iron-pages> |
| 79 </div> | 80 </div> |
| 80 </template> | 81 </template> |
| 81 <script src="chrome://history/app.js"></script> | 82 <script src="chrome://history/app.js"></script> |
| 82 </dom-module> | 83 </dom-module> |
| OLD | NEW |