Chromium Code Reviews| 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/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 | 9 |
| 10 <dom-module id="history-app"> | 10 <dom-module id="history-app"> |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 | 31 |
| 32 #content { | 32 #content { |
| 33 display: flex; | 33 display: flex; |
| 34 flex: 1 0 0; | 34 flex: 1 0 0; |
| 35 } | 35 } |
| 36 | 36 |
| 37 history-toolbar { | 37 history-toolbar { |
| 38 background: var(--md-toolbar-color); | 38 background: var(--md-toolbar-color); |
| 39 } | 39 } |
| 40 </style> | 40 </style> |
| 41 <history-toolbar id="toolbar"></history-toolbar> | 41 <history-toolbar id="toolbar" searching="[[queryState_.querying]]" |
| 42 search-term="{{queryState_.searchTerm}}" | |
| 43 query-start-time="[[queryState_.queryStartTime]]" | |
| 44 query-end-time="[[queryState_.queryEndTime]]"> | |
| 45 </history-toolbar> | |
| 42 | 46 |
| 43 <div id="main-container"> | 47 <div id="main-container"> |
| 44 <history-side-bar id="history-side-bar" selected-page="{{selectedPage}}"> | 48 <history-side-bar id="history-side-bar" selected-page="{{selectedPage}}"> |
| 45 </history-side-bar> | 49 </history-side-bar> |
| 46 <iron-pages id="content" attr-for-selected="id" | 50 <iron-pages id="content" attr-for-selected="id" |
| 47 selected="{{selectedPage}}"> | 51 selected="{{selectedPage}}"> |
| 48 <history-list id="history-list"></history-list> | 52 <history-list id="history-list" querying="[[queryState_.querying]]" |
| 53 searched-term="{{queryState_.info.term}}"> | |
|
tsergeant
2016/05/13 03:41:06
If I'm reading this correctly, this will set searc
calamity
2016/05/18 01:41:52
As discussed, this is set when the query returns.
| |
| 54 </history-list> | |
| 49 <history-synced-device-manager id="history-synced-device-manager"> | 55 <history-synced-device-manager id="history-synced-device-manager"> |
| 50 </history-synced-device-manager> | 56 </history-synced-device-manager> |
| 51 </iron-pages> | 57 </iron-pages> |
| 52 </div> | 58 </div> |
| 53 </template> | 59 </template> |
| 54 <script src="chrome://history/app.js"></script> | 60 <script src="chrome://history/app.js"></script> |
| 55 </dom-module> | 61 </dom-module> |
| OLD | NEW |