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

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

Issue 2068613002: [MD History] Add URL parameter for search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@routing
Patch Set: remove_var 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/app.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/html/cr/ui.html"> 2 <link rel="import" href="chrome://resources/html/cr/ui.html">
3 <link rel="import" href="chrome://resources/html/cr/ui/command.html"> 3 <link rel="import" href="chrome://resources/html/cr/ui/command.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-location. html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-location. html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-route.htm l"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-route.htm l">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml">
7 <link rel="import" href="chrome://history/history_toolbar.html"> 7 <link rel="import" href="chrome://history/history_toolbar.html">
8 <link rel="import" href="chrome://history/list_container.html"> 8 <link rel="import" href="chrome://history/list_container.html">
9 <link rel="import" href="chrome://history/synced_device_manager.html"> 9 <link rel="import" href="chrome://history/synced_device_manager.html">
10 <link rel="import" href="chrome://history/side_bar.html"> 10 <link rel="import" href="chrome://history/side_bar.html">
(...skipping 23 matching lines...) Expand all
34 :host([grouped_]) #main-container { 34 :host([grouped_]) #main-container {
35 height: calc(100% - var(--toolbar-grouped-height)); 35 height: calc(100% - var(--toolbar-grouped-height));
36 } 36 }
37 37
38 #content, 38 #content,
39 #content > * { 39 #content > * {
40 height: 100%; 40 height: 100%;
41 } 41 }
42 </style> 42 </style>
43 <app-location route="{{route_}}"></app-location> 43 <app-location route="{{route_}}"></app-location>
44 <app-route route="{{route_}}" pattern="/:page" data="{{routeData_}}"> 44 <app-route route="{{route_}}" pattern="/:page" data="{{routeData_}}"
45 query-params="{{queryParams_}}">
45 </app-route> 46 </app-route>
46 <history-toolbar id="toolbar" 47 <history-toolbar id="toolbar"
47 spinner-active="[[shouldShowSpinner_(queryState_.querying, 48 spinner-active="[[shouldShowSpinner_(queryState_.querying,
48 queryState_.incremental, 49 queryState_.incremental,
49 queryState_.searchTerm)]]" 50 queryState_.searchTerm)]]"
50 is-grouped-mode="{{grouped_}}" 51 is-grouped-mode="{{grouped_}}"
51 grouped-range="{{queryState_.range}}" 52 grouped-range="{{queryState_.range}}"
52 search-term="{{queryState_.searchTerm}}" 53 search-term="{{queryState_.searchTerm}}"
53 query-start-time="[[queryResult_.info.queryStartTime]]" 54 query-start-time="[[queryResult_.info.queryStartTime]]"
54 query-end-time="[[queryResult_.info.queryEndTime]]"> 55 query-end-time="[[queryResult_.info.queryEndTime]]">
55 </history-toolbar> 56 </history-toolbar>
56 57
57 <div id="main-container"> 58 <div id="main-container">
58 <iron-pages id="content" attr-for-selected="path" 59 <iron-pages id="content" attr-for-selected="path"
59 fallback-selection="history" 60 fallback-selection="history"
60 selected="[[getSelectedPage_(selectedPage_, items)]]" 61 selected="[[getSelectedPage_(selectedPage_, items)]]"
61 items="{{items}}"> 62 items="{{items}}">
62 <history-list-container id="history" query-state="{{queryState_}}" 63 <history-list-container id="history" query-state="{{queryState_}}"
63 query-result="[[queryResult_]]" grouped="[[grouped_]]" 64 query-result="[[queryResult_]]" grouped="[[grouped_]]"
64 path="history"> 65 path="history">
65 </history-list-container> 66 </history-list-container>
66 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> 67 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]">
67 <history-synced-device-manager id="synced-devices" 68 <history-synced-device-manager id="synced-devices"
68 session-list="[[queryResult_.sessionList]]" 69 session-list="[[queryResult_.sessionList]]"
69 searched-term=[[queryState_.searchTerm]] 70 search-term=[[queryState_.searchTerm]]
70 path="syncedTabs"> 71 path="syncedTabs">
71 </history-synced-device-manager> 72 </history-synced-device-manager>
72 </template> 73 </template>
73 </iron-pages> 74 </iron-pages>
74 </div> 75 </div>
75 76
76 <history-side-bar id="side-bar" selected-page="[[selectedPage_]]"> 77 <history-side-bar id="side-bar" selected-page="[[selectedPage_]]"
78 route="[[route_]]">
77 </history-side-bar> 79 </history-side-bar>
78 </template> 80 </template>
79 <script src="chrome://history/app.js"></script> 81 <script src="chrome://history/app.js"></script>
80 </dom-module> 82 </dom-module>
OLDNEW
« 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