| 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 |
| 11 <dom-module id="history-app"> | 11 <dom-module id="history-app"> |
| 12 <!-- TODO(calamity): work around this deprecated import style --> | 12 <!-- TODO(calamity): work around this deprecated import style --> |
| 13 <template> | 13 <template> |
| 14 <style no-process> | 14 <style no-process> |
| 15 history-toolbar { | 15 history-toolbar { |
| 16 background: var(--md-toolbar-color); | 16 background: var(--md-toolbar-color); |
| 17 } | 17 } |
| 18 </style> | 18 </style> |
| 19 <style include="shared-style"> | 19 <style include="shared-style"> |
| 20 :host { | 20 :host { |
| 21 display: block; | 21 display: block; |
| 22 height: 100%; | 22 height: 100%; |
| 23 min-width: 800px; | |
| 24 overflow: hidden; | 23 overflow: hidden; |
| 25 } | 24 } |
| 26 | 25 |
| 27 /* Sizing this with flex causes slow load performance, see | 26 /* Sizing this with flex causes slow load performance, see |
| 28 crbug.com/618153. */ | 27 crbug.com/618153. */ |
| 29 #main-container { | 28 #main-container { |
| 30 height: calc(100% - var(--toolbar-height)); | 29 height: calc(100% - var(--toolbar-height)); |
| 31 } | 30 } |
| 32 | 31 |
| 33 :host([grouped_]) #main-container { | 32 :host([grouped_]) #main-container { |
| 34 height: calc(100% - var(--toolbar-grouped-height)); | 33 height: calc(100% - var(--toolbar-grouped-height)); |
| 35 } | 34 } |
| 36 | 35 |
| 37 #content, | 36 #content, |
| 38 #content > * { | 37 #content > * { |
| 39 height: 100%; | 38 height: 100%; |
| 40 } | 39 } |
| 41 | |
| 42 #history-side-bar { | |
| 43 float: left; | |
| 44 } | |
| 45 </style> | 40 </style> |
| 46 <history-toolbar id="toolbar" | 41 <history-toolbar id="toolbar" |
| 47 spinner-active="[[shouldShowSpinner_(queryState_.querying, | 42 spinner-active="[[shouldShowSpinner_(queryState_.querying, |
| 48 queryState_.incremental, | 43 queryState_.incremental, |
| 49 queryState_.searchTerm)]]" | 44 queryState_.searchTerm)]]" |
| 50 is-grouped-mode="{{grouped_}}" | 45 is-grouped-mode="{{grouped_}}" |
| 51 grouped-range="{{queryState_.range}}" | 46 grouped-range="{{queryState_.range}}" |
| 52 search-term="{{queryState_.searchTerm}}" | 47 search-term="{{queryState_.searchTerm}}" |
| 53 query-start-time="[[queryState_.info.queryStartTime]]" | 48 query-start-time="[[queryState_.info.queryStartTime]]" |
| 54 query-end-time="[[queryState_.info.queryEndTime]]"> | 49 query-end-time="[[queryState_.info.queryEndTime]]"> |
| 55 </history-toolbar> | 50 </history-toolbar> |
| 56 | 51 |
| 57 <div id="main-container"> | 52 <div id="main-container"> |
| 58 <history-side-bar id="history-side-bar" selected-page="{{selectedPage_}}"> | |
| 59 </history-side-bar> | |
| 60 <iron-pages id="content" attr-for-selected="id" | 53 <iron-pages id="content" attr-for-selected="id" |
| 61 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]"> | 54 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]"> |
| 62 <history-list id="history-list" querying="[[queryState_.querying]]" | 55 <history-list id="history-list" querying="[[queryState_.querying]]" |
| 63 searched-term="[[queryState_.info.term]]"></history-list> | 56 searched-term="[[queryState_.info.term]]"></history-list> |
| 64 <template is="dom-if" if="[[grouped_]]"> | 57 <template is="dom-if" if="[[grouped_]]"> |
| 65 <history-grouped-list id="history-grouped-list" | 58 <history-grouped-list id="history-grouped-list" |
| 66 range="[[queryState_.range]]" | 59 range="[[queryState_.range]]" |
| 67 query-start-time="[[queryState_.info.queryStartTime]]" | 60 query-start-time="[[queryState_.info.queryStartTime]]" |
| 68 query-end-time="[[queryState_.info.queryEndTime]]" | 61 query-end-time="[[queryState_.info.queryEndTime]]" |
| 69 searched-term="[[queryState_.info.term]]"> | 62 searched-term="[[queryState_.info.term]]"> |
| 70 </history-grouped-list> | 63 </history-grouped-list> |
| 71 </template> | 64 </template> |
| 72 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 65 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
| 73 <history-synced-device-manager id="history-synced-device-manager" | 66 <history-synced-device-manager id="history-synced-device-manager" |
| 74 session-list="[[queryState_.sessionList]]" | 67 session-list="[[queryState_.sessionList]]" |
| 75 searched-term=[[queryState_.info.term]]> | 68 searched-term=[[queryState_.info.term]]> |
| 76 </history-synced-device-manager> | 69 </history-synced-device-manager> |
| 77 </template> | 70 </template> |
| 78 </iron-pages> | 71 </iron-pages> |
| 79 </div> | 72 </div> |
| 73 |
| 74 <history-side-bar id="side-bar" selected-page="{{selectedPage_}}"> |
| 75 </history-side-bar> |
| 80 </template> | 76 </template> |
| 81 <script src="chrome://history/app.js"></script> | 77 <script src="chrome://history/app.js"></script> |
| 82 </dom-module> | 78 </dom-module> |
| OLD | NEW |