| 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/app-layout/app-drawer/a
pp-drawer.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-flex-layout/iron-f
lex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> | 4 <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"> | 5 <link rel="import" href="chrome://history/grouped_list.html"> |
| 5 <link rel="import" href="chrome://history/history_list.html"> | 6 <link rel="import" href="chrome://history/history_list.html"> |
| 6 <link rel="import" href="chrome://history/history_toolbar.html"> | 7 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 7 <link rel="import" href="chrome://history/synced_device_manager.html"> | 8 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 8 <link rel="import" href="chrome://history/side_bar.html"> | 9 <link rel="import" href="chrome://history/side_bar.html"> |
| 9 <link rel="import" href="chrome://history/shared_style.html"> | 10 <link rel="import" href="chrome://history/shared_style.html"> |
| 10 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 11 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
| 11 | 12 |
| 12 <dom-module id="history-app"> | 13 <dom-module id="history-app"> |
| 13 <!-- TODO(calamity): work around this deprecated import style --> | 14 <!-- TODO(calamity): work around this deprecated import style --> |
| 14 <template> | 15 <template> |
| 15 <style no-process> | 16 <style no-process> |
| 16 history-toolbar { | 17 history-toolbar { |
| 17 background: var(--md-toolbar-color); | 18 background: var(--md-toolbar-color); |
| 18 } | 19 } |
| 19 </style> | 20 </style> |
| 20 <style include="shared-style"> | 21 <style include="shared-style"> |
| 21 :host { | 22 :host { |
| 22 display: flex; | 23 display: flex; |
| 23 flex-direction: column; | 24 flex-direction: column; |
| 24 min-width: 800px; | |
| 25 } | 25 } |
| 26 | 26 |
| 27 #main-container { | 27 #main-container { |
| 28 display: flex; | 28 display: flex; |
| 29 flex: 1 0 0; | 29 flex: 1 0 0; |
| 30 overflow: hidden; | 30 overflow: hidden; |
| 31 } | 31 } |
| 32 | 32 |
| 33 history-list, | 33 history-list, |
| 34 history-synced-device-manager, | 34 history-synced-device-manager, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 47 queryState_.incremental, | 47 queryState_.incremental, |
| 48 queryState_.searchTerm)]]" | 48 queryState_.searchTerm)]]" |
| 49 is-grouped-mode="{{grouped_}}" | 49 is-grouped-mode="{{grouped_}}" |
| 50 grouped-range="{{queryState_.range}}" | 50 grouped-range="{{queryState_.range}}" |
| 51 search-term="{{queryState_.searchTerm}}" | 51 search-term="{{queryState_.searchTerm}}" |
| 52 query-start-time="[[queryState_.info.queryStartTime]]" | 52 query-start-time="[[queryState_.info.queryStartTime]]" |
| 53 query-end-time="[[queryState_.info.queryEndTime]]"> | 53 query-end-time="[[queryState_.info.queryEndTime]]"> |
| 54 </history-toolbar> | 54 </history-toolbar> |
| 55 | 55 |
| 56 <div id="main-container"> | 56 <div id="main-container"> |
| 57 <history-side-bar id="history-side-bar" selected-page="{{selectedPage_}}"> | |
| 58 </history-side-bar> | |
| 59 <iron-pages id="content" attr-for-selected="id" | 57 <iron-pages id="content" attr-for-selected="id" |
| 60 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]"> | 58 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]"> |
| 61 <history-list id="history-list" querying="[[queryState_.querying]]" | 59 <history-list id="history-list" querying="[[queryState_.querying]]" |
| 62 searched-term="[[queryState_.info.term]]"></history-list> | 60 searched-term="[[queryState_.info.term]]"></history-list> |
| 63 <template is="dom-if" if="[[grouped_]]"> | 61 <template is="dom-if" if="[[grouped_]]"> |
| 64 <history-grouped-list id="history-grouped-list" | 62 <history-grouped-list id="history-grouped-list" |
| 65 range="[[queryState_.range]]" | 63 range="[[queryState_.range]]" |
| 66 query-start-time="[[queryState_.info.queryStartTime]]" | 64 query-start-time="[[queryState_.info.queryStartTime]]" |
| 67 query-end-time="[[queryState_.info.queryEndTime]]" | 65 query-end-time="[[queryState_.info.queryEndTime]]" |
| 68 searched-term="[[queryState_.info.term]]"> | 66 searched-term="[[queryState_.info.term]]"> |
| 69 </history-grouped-list> | 67 </history-grouped-list> |
| 70 </template> | 68 </template> |
| 71 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 69 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
| 72 <history-synced-device-manager id="history-synced-device-manager" | 70 <history-synced-device-manager id="history-synced-device-manager" |
| 73 session-list="[[queryState_.sessionList]]" | 71 session-list="[[queryState_.sessionList]]" |
| 74 searched-term=[[queryState_.info.term]]> | 72 searched-term=[[queryState_.info.term]]> |
| 75 </history-synced-device-manager> | 73 </history-synced-device-manager> |
| 76 </template> | 74 </template> |
| 77 </iron-pages> | 75 </iron-pages> |
| 78 </div> | 76 </div> |
| 77 |
| 78 <history-side-bar id="side-bar" tabindex="0" |
| 79 selected-page="{{selectedPage_}}"> |
| 80 </history-side-bar> |
| 79 </template> | 81 </template> |
| 80 <script src="chrome://history/app.js"></script> | 82 <script src="chrome://history/app.js"></script> |
| 81 </dom-module> | 83 </dom-module> |
| OLD | NEW |