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-flex-layout/iron-f
lex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> |
4 <link rel="import" href="chrome://history/grouped_list.html"> | 4 <link rel="import" href="chrome://history/grouped_list.html"> |
5 <link rel="import" href="chrome://history/history_list.html"> | 5 <link rel="import" href="chrome://history/history_list.html"> |
6 <link rel="import" href="chrome://history/history_toolbar.html"> | 6 <link rel="import" href="chrome://history/history_toolbar.html"> |
7 <link rel="import" href="chrome://history/synced_device_manager.html"> | 7 <link rel="import" href="chrome://history/synced_device_manager.html"> |
8 <link rel="import" href="chrome://history/side_bar.html"> | 8 <link rel="import" href="chrome://history/side_bar.html"> |
9 <link rel="import" href="chrome://history/shared_style.html"> | 9 <link rel="import" href="chrome://history/shared_style.html"> |
| 10 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
10 | 11 |
11 <dom-module id="history-app"> | 12 <dom-module id="history-app"> |
12 <!-- TODO(calamity): work around this deprecated import style --> | 13 <!-- TODO(calamity): work around this deprecated import style --> |
13 <link rel="import" type="css" href="chrome://resources/css/md_colors.css"> | |
14 <template> | 14 <template> |
| 15 <style no-process> |
| 16 history-toolbar { |
| 17 background: var(--md-toolbar-color); |
| 18 } |
| 19 </style> |
15 <style include="shared-style"> | 20 <style include="shared-style"> |
16 :host { | 21 :host { |
17 display: flex; | 22 display: flex; |
18 flex-direction: column; | 23 flex-direction: column; |
19 min-width: 800px; | 24 min-width: 800px; |
20 } | 25 } |
21 | 26 |
22 #main-container { | 27 #main-container { |
23 display: flex; | 28 display: flex; |
24 flex: 1 0 0; | 29 flex: 1 0 0; |
25 overflow: hidden; | 30 overflow: hidden; |
26 } | 31 } |
27 | 32 |
28 history-list, | 33 history-list, |
29 history-synced-device-manager, | 34 history-synced-device-manager, |
30 history-grouped-list { | 35 history-grouped-list { |
31 flex: 1 0 0; | 36 flex: 1 0 0; |
32 } | 37 } |
33 | 38 |
34 #content { | 39 #content { |
35 display: flex; | 40 display: flex; |
36 flex: 1 0 0; | 41 flex: 1 0 0; |
37 overflow: hidden; | 42 overflow: hidden; |
38 } | 43 } |
39 | |
40 history-toolbar { | |
41 background: var(--md-toolbar-color); | |
42 } | |
43 </style> | 44 </style> |
44 <history-toolbar id="toolbar" searching="[[queryState_.querying]]" | 45 <history-toolbar id="toolbar" searching="[[queryState_.querying]]" |
45 is-grouped-mode="{{grouped_}}" | 46 is-grouped-mode="{{grouped_}}" |
46 grouped-range="{{queryState_.range}}" | 47 grouped-range="{{queryState_.range}}" |
47 search-term="{{queryState_.searchTerm}}" | 48 search-term="{{queryState_.searchTerm}}" |
48 query-start-time="[[queryState_.info.queryStartTime]]" | 49 query-start-time="[[queryState_.info.queryStartTime]]" |
49 query-end-time="[[queryState_.info.queryEndTime]]"> | 50 query-end-time="[[queryState_.info.queryEndTime]]"> |
50 </history-toolbar> | 51 </history-toolbar> |
51 | 52 |
52 <div id="main-container"> | 53 <div id="main-container"> |
(...skipping 14 matching lines...) Expand all Loading... |
67 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 68 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
68 <history-synced-device-manager id="history-synced-device-manager" | 69 <history-synced-device-manager id="history-synced-device-manager" |
69 session-list="[[queryState_.sessionList]]"> | 70 session-list="[[queryState_.sessionList]]"> |
70 </history-synced-device-manager> | 71 </history-synced-device-manager> |
71 </template> | 72 </template> |
72 </iron-pages> | 73 </iron-pages> |
73 </div> | 74 </div> |
74 </template> | 75 </template> |
75 <script src="chrome://history/app.js"></script> | 76 <script src="chrome://history/app.js"></script> |
76 </dom-module> | 77 </dom-module> |
OLD | NEW |