Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: chrome/browser/resources/md_history/app.html

Issue 1993613002: [MD History] Implement grouped history UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@privatize
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/history_list.html"> 5 <link rel="import" href="chrome://history/history_list.html">
5 <link rel="import" href="chrome://history/history_toolbar.html"> 6 <link rel="import" href="chrome://history/history_toolbar.html">
6 <link rel="import" href="chrome://history/synced_device_manager.html"> 7 <link rel="import" href="chrome://history/synced_device_manager.html">
7 <link rel="import" href="chrome://history/side_bar.html"> 8 <link rel="import" href="chrome://history/side_bar.html">
8 <link rel="import" href="chrome://history/shared_style.html"> 9 <link rel="import" href="chrome://history/shared_style.html">
9 10
10 <dom-module id="history-app"> 11 <dom-module id="history-app">
11 <!-- TODO(calamity): work around this deprecated import style --> 12 <!-- TODO(calamity): work around this deprecated import style -->
12 <link rel="import" type="css" href="chrome://resources/css/md_colors.css"> 13 <link rel="import" type="css" href="chrome://resources/css/md_colors.css">
13 <template> 14 <template>
14 <style include="shared-style"> 15 <style include="shared-style">
15 :host { 16 :host {
16 display: flex; 17 display: flex;
17 flex-direction: column; 18 flex-direction: column;
18 min-width: 800px; 19 min-width: 800px;
19 } 20 }
20 21
21 #main-container { 22 #main-container {
22 display: flex; 23 display: flex;
23 flex: 1 0 0; 24 flex: 1 0 0;
24 overflow: hidden; 25 overflow: hidden;
25 } 26 }
26 27
27 history-list, 28 history-list,
28 #history-synced-device-manager { 29 history-synced-device-manager,
30 history-grouped-list {
29 flex: 1 0 0; 31 flex: 1 0 0;
30 } 32 }
31 33
32 #content { 34 #content {
33 display: flex; 35 display: flex;
34 flex: 1 0 0; 36 flex: 1 0 0;
37 overflow: hidden;
35 } 38 }
36 39
37 history-toolbar { 40 history-toolbar {
38 background: var(--md-toolbar-color); 41 background: var(--md-toolbar-color);
39 } 42 }
40 </style> 43 </style>
41 <history-toolbar id="toolbar" searching="[[queryState_.querying]]" 44 <history-toolbar id="toolbar" searching="[[queryState_.querying]]"
45 is-grouped-mode="{{grouped_}}"
46 grouped-range="{{queryState_.range}}"
42 search-term="{{queryState_.searchTerm}}" 47 search-term="{{queryState_.searchTerm}}"
43 query-start-time="[[queryState_.queryStartTime]]" 48 query-start-time="[[queryState_.info.queryStartTime]]"
44 query-end-time="[[queryState_.queryEndTime]]"> 49 query-end-time="[[queryState_.info.queryEndTime]]">
45 </history-toolbar> 50 </history-toolbar>
46 51
47 <div id="main-container"> 52 <div id="main-container">
48 <history-side-bar id="history-side-bar" selected-page="{{selectedPage}}"> 53 <history-side-bar id="history-side-bar" selected-page="{{selectedPage_}}">
49 </history-side-bar> 54 </history-side-bar>
50 <iron-pages id="content" attr-for-selected="id" 55 <iron-pages id="content" attr-for-selected="id"
51 selected="{{selectedPage}}"> 56 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]">
52 <history-list id="history-list" querying="[[queryState_.querying]]" 57 <history-list id="history-list" querying="[[queryState_.querying]]"
53 searched-term="{{queryState_.info.term}}"> 58 searched-term="{{queryState_.info.term}}"></history-list>
54 </history-list> 59 <template is="dom-if" if="[[grouped_]]">
tsergeant 2016/05/19 05:38:17 🙌 doing it this way takes advantage of lazy regist
calamity 2016/05/20 06:51:58 Hmm. Based on tabSyncEnabled? I guess that could w
60 <history-grouped-list id="history-grouped-list"
61 range="[[queryState_.range]]"
62 query-start-time="[[queryState_.info.queryStartTime]]"
63 query-end-time="[[queryState_.info.queryEndTime]]">
64 </history-grouped-list>
65 </template>
55 <history-synced-device-manager id="history-synced-device-manager"> 66 <history-synced-device-manager id="history-synced-device-manager">
56 </history-synced-device-manager> 67 </history-synced-device-manager>
57 </iron-pages> 68 </iron-pages>
58 </div> 69 </div>
59 </template> 70 </template>
60 <script src="chrome://history/app.js"></script> 71 <script src="chrome://history/app.js"></script>
61 </dom-module> 72 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698