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

Unified Diff: chrome/browser/resources/md_history/app.html

Issue 2042973002: [MD History] Add routing to the synced devices page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hide_search_bar
Patch Set: rebase Created 4 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/app.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 fb4c2ee1ab913e921a9778c7102f2a1370ff1a66..ab94f7ecefc51346aa2ac9fabfd0b3bba62364e7 100644
--- a/chrome/browser/resources/md_history/app.html
+++ b/chrome/browser/resources/md_history/app.html
@@ -1,6 +1,8 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/html/cr/ui.html">
<link rel="import" href="chrome://resources/html/cr/ui/command.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-location.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-route.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html">
<link rel="import" href="chrome://history/history_toolbar.html">
<link rel="import" href="chrome://history/list_container.html">
@@ -38,6 +40,9 @@
height: 100%;
}
</style>
+ <app-location route="{{route_}}"></app-location>
+ <app-route route="{{route_}}" pattern="/:page" data="{{routeData_}}">
+ </app-route>
<history-toolbar id="toolbar"
spinner-active="[[shouldShowSpinner_(queryState_.querying,
queryState_.incremental,
@@ -50,21 +55,25 @@
</history-toolbar>
<div id="main-container">
- <iron-pages id="content" attr-for-selected="id"
- selected="[[selectedPage_]]">
+ <iron-pages id="content" attr-for-selected="path"
+ fallback-selection="history"
+ selected="[[getSelectedPage_(selectedPage_, items)]]"
+ items="{{items}}">
<history-list-container id="history" query-state="{{queryState_}}"
- query-result="[[queryResult_]]" grouped="[[grouped_]]">
+ query-result="[[queryResult_]]" grouped="[[grouped_]]"
+ path="history">
</history-list-container>
<template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]">
<history-synced-device-manager id="synced-devices"
session-list="[[queryResult_.sessionList]]"
- searched-term=[[queryState_.searchTerm]]>
+ searched-term=[[queryState_.searchTerm]]
+ path="syncedTabs">
</history-synced-device-manager>
</template>
</iron-pages>
</div>
- <history-side-bar id="side-bar" selected-page="{{selectedPage_}}">
+ <history-side-bar id="side-bar" selected-page="[[selectedPage_]]">
</history-side-bar>
</template>
<script src="chrome://history/app.js"></script>
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/app.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698