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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/md_history/app.html
diff --git a/chrome/browser/resources/md_history/app.html b/chrome/browser/resources/md_history/app.html
index 9a7294f73232dfe7b378ff60a5a1a01946bb49c6..ac5c8eb86ca0c65568270b9d7378671f604251e0 100644
--- a/chrome/browser/resources/md_history/app.html
+++ b/chrome/browser/resources/md_history/app.html
@@ -1,6 +1,7 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html">
+<link rel="import" href="chrome://history/grouped_list.html">
<link rel="import" href="chrome://history/history_list.html">
<link rel="import" href="chrome://history/history_toolbar.html">
<link rel="import" href="chrome://history/synced_device_manager.html">
@@ -25,13 +26,15 @@
}
history-list,
- #history-synced-device-manager {
+ history-synced-device-manager,
+ history-grouped-list {
flex: 1 0 0;
}
#content {
display: flex;
flex: 1 0 0;
+ overflow: hidden;
}
history-toolbar {
@@ -39,19 +42,27 @@
}
</style>
<history-toolbar id="toolbar" searching="[[queryState_.querying]]"
+ is-grouped-mode="{{grouped_}}"
+ grouped-range="{{queryState_.range}}"
search-term="{{queryState_.searchTerm}}"
- query-start-time="[[queryState_.queryStartTime]]"
- query-end-time="[[queryState_.queryEndTime]]">
+ query-start-time="[[queryState_.info.queryStartTime]]"
+ query-end-time="[[queryState_.info.queryEndTime]]">
</history-toolbar>
<div id="main-container">
- <history-side-bar id="history-side-bar" selected-page="{{selectedPage}}">
+ <history-side-bar id="history-side-bar" selected-page="{{selectedPage_}}">
</history-side-bar>
<iron-pages id="content" attr-for-selected="id"
- selected="{{selectedPage}}">
+ selected="[[getSelectedPage(selectedPage_, queryState_.range)]]">
<history-list id="history-list" querying="[[queryState_.querying]]"
- searched-term="{{queryState_.info.term}}">
- </history-list>
+ searched-term="{{queryState_.info.term}}"></history-list>
+ <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
+ <history-grouped-list id="history-grouped-list"
+ range="[[queryState_.range]]"
+ query-start-time="[[queryState_.info.queryStartTime]]"
+ query-end-time="[[queryState_.info.queryEndTime]]">
+ </history-grouped-list>
+ </template>
<history-synced-device-manager id="history-synced-device-manager">
</history-synced-device-manager>
</iron-pages>

Powered by Google App Engine
This is Rietveld 408576698