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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2352293002: MD History: Replace app-route with a custom router (Closed)
Patch Set: More minor cleanup Created 4 years, 3 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
« chrome/browser/resources/md_history/app.js ('K') | « chrome/browser/resources/md_history/app.crisper.js ('k') | chrome/browser/resources/md_history/compiled_resources2.gyp » ('j') | chrome/browser/resources/md_history/history_router.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <html><head><!-- 1 <html><head><!--
2 @license 2 @license
3 Copyright (c) 2014 The Polymer Project Authors. All rights reserved. 3 Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt 4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt
5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt 5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt 6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt
7 Code distributed by Google as part of the polymer project is also 7 Code distributed by Google as part of the polymer project is also
8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt 8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt
9 --><!-- 9 --><!--
10 @license 10 @license
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 </style> 277 </style>
278 278
279 <div id="scrim" on-tap="close"></div> 279 <div id="scrim" on-tap="close"></div>
280 280
281 <div id="contentContainer"> 281 <div id="contentContainer">
282 <content></content> 282 <content></content>
283 </div> 283 </div>
284 </template> 284 </template>
285 285
286 </dom-module> 286 </dom-module>
287 <dom-module id="app-location" assetpath="chrome://resources/polymer/v1_0/app-rou te/" css-build="shadow">
288 <template>
289 <iron-location path="{{__path}}" query="{{__query}}" hash="{{__hash}}" url-s pace-regex="{{urlSpaceRegex}}">
290 </iron-location>
291 <iron-query-params params-string="{{__query}}" params-object="{{queryParams} }">
292 </iron-query-params>
293 </template>
294 </dom-module>
295 <dom-module id="iron-pages" assetpath="chrome://resources/polymer/v1_0/iron-page s/" css-build="shadow"> 287 <dom-module id="iron-pages" assetpath="chrome://resources/polymer/v1_0/iron-page s/" css-build="shadow">
296 288
297 <template> 289 <template>
298 <style scope="iron-pages">:host { 290 <style scope="iron-pages">:host {
299 display: block; 291 display: block;
300 } 292 }
301 293
302 :host > ::content > :not(.iron-selected) { 294 :host > ::content > :not(.iron-selected) {
303 display: none !important; 295 display: none !important;
304 } 296 }
305 297
306 </style> 298 </style>
307 299
308 <content></content> 300 <content></content>
309 </template> 301 </template>
310 302
311 </dom-module> 303 </dom-module>
304 <dom-module id="history-router" assetpath="chrome://history/" css-build="shadow" >
305 <template>
306 <iron-location path="{{path_}}" query="{{query_}}"></iron-location>
307 <iron-query-params params-string="{{query_}}" params-object="{{queryParams_} }">
308 </iron-query-params>
309 </template>
310 </dom-module>
312 <dom-module id="iron-overlay-backdrop" assetpath="chrome://resources/polymer/v1_ 0/iron-overlay-behavior/" css-build="shadow"> 311 <dom-module id="iron-overlay-backdrop" assetpath="chrome://resources/polymer/v1_ 0/iron-overlay-behavior/" css-build="shadow">
313 312
314 <template> 313 <template>
315 <style scope="iron-overlay-backdrop">:host { 314 <style scope="iron-overlay-backdrop">:host {
316 position: fixed; 315 position: fixed;
317 top: 0; 316 top: 0;
318 left: 0; 317 left: 0;
319 width: 100%; 318 width: 100%;
320 height: 100%; 319 height: 100%;
321 background-color: var(--iron-overlay-backdrop-background-color, #000); 320 background-color: var(--iron-overlay-backdrop-background-color, #000);
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
1259 1258
1260 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g> 1259 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g>
1261 <g id="arrow-drop-down"><path d="M7 10l5 5 5-5z"></path></g> 1260 <g id="arrow-drop-down"><path d="M7 10l5 5 5-5z"></path></g>
1262 <g id="cancel"><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10- 10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"></path></g> 1261 <g id="cancel"><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10- 10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"></path></g>
1263 <if expr="chromeos"> 1262 <if expr="chromeos">
1264 <g id="check"><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"> </path></g> 1263 <g id="check"><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"> </path></g>
1265 </if> 1264 </if>
1266 <g id="chevron-right"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6 -6z"></path></g> 1265 <g id="chevron-right"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6 -6z"></path></g>
1267 <g id="clear"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></g> 1266 <g id="clear"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></g>
1268 <g id="close"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></g> 1267 <g id="close"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></g>
1268 <g id="delete"><path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h -3.5l-1-1h-5l-1 1H5v2h14V4z"></path></g>
1269 <g id="domain"><path d="M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2z m0-4H4V9h2v2zm0-4H4V5h2v2zm4 12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2 zm10 12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z"></path> </g> 1269 <g id="domain"><path d="M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2z m0-4H4V9h2v2zm0-4H4V5h2v2zm4 12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2 zm10 12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z"></path> </g>
1270 <g id="expand-less"><path d="M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14 z"></path></g> 1270 <g id="expand-less"><path d="M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14 z"></path></g>
1271 <g id="expand-more"><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z" ></path></g> 1271 <g id="expand-more"><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z" ></path></g>
1272 <g id="extension"><path d="M20.5 11H19V7c0-1.1-.9-2-2-2h-4V3.5C13 2.12 11. 88 1 10.5 1S8 2.12 8 3.5V5H4c-1.1 0-1.99.9-1.99 2v3.8H3.5c1.49 0 2.7 1.21 2.7 2. 7s-1.21 2.7-2.7 2.7H2V20c0 1.1.9 2 2 2h3.8v-1.5c0-1.49 1.21-2.7 2.7-2.7 1.49 0 2 .7 1.21 2.7 2.7V22H17c1.1 0 2-.9 2-2v-4h1.5c1.38 0 2.5-1.12 2.5-2.5S21.88 11 20. 5 11z"></path></g> 1272 <g id="extension"><path d="M20.5 11H19V7c0-1.1-.9-2-2-2h-4V3.5C13 2.12 11. 88 1 10.5 1S8 2.12 8 3.5V5H4c-1.1 0-1.99.9-1.99 2v3.8H3.5c1.49 0 2.7 1.21 2.7 2. 7s-1.21 2.7-2.7 2.7H2V20c0 1.1.9 2 2 2h3.8v-1.5c0-1.49 1.21-2.7 2.7-2.7 1.49 0 2 .7 1.21 2.7 2.7V22H17c1.1 0 2-.9 2-2v-4h1.5c1.38 0 2.5-1.12 2.5-2.5S21.88 11 20. 5 11z"></path></g>
1273 <g id="file-download"><path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"> </path></g> 1273 <g id="file-download"><path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"> </path></g>
1274 <g id="fullscreen"><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3 v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"></path></g> 1274 <g id="fullscreen"><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3 v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"></path></g>
1275 <g id="group"><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0 -3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.2 9 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"> </path></g> 1275 <g id="group"><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0 -3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.2 9 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"> </path></g>
1276 <g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></pat h></g> 1276 <g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></pat h></g>
1277 <g id="more-vert"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"></path></g> 1277 <g id="more-vert"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"></path></g>
1278 <g id="person"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1. 79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></g> 1278 <g id="person"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1. 79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></g>
(...skipping 3721 matching lines...) Expand 10 before | Expand all | Expand 10 after
5000 margin: 24px 0; 5000 margin: 24px 0;
5001 } 5001 }
5002 5002
5003 #footer a { 5003 #footer a {
5004 color: var(--google-blue-700); 5004 color: var(--google-blue-700);
5005 text-decoration: none; 5005 text-decoration: none;
5006 } 5006 }
5007 5007
5008 </style> 5008 </style>
5009 5009
5010 <iron-selector id="menu" selected="[[selectedPage]]" selectable=".page-item" attr-for-selected="path" fallback-selection="history" on-iron-activate="onSelec torActivate_"> 5010 <iron-selector id="menu" selected="{{selectedPage}}" selectable=".page-item" attr-for-selected="path" fallback-selection="history" on-iron-activate="onSelec torActivate_">
5011 <a href="/[[getQueryString_(route)]]" class="page-item" path="history"> 5011 <a href="/" class="page-item" path="history" on-click="onItemClick_">
5012 $i18n{historyMenuItem} 5012 $i18n{historyMenuItem}
5013 <paper-ripple></paper-ripple> 5013 <paper-ripple></paper-ripple>
5014 </a> 5014 </a>
5015 <a href="/syncedTabs[[getQueryString_(route)]]" class="page-item" path="sy ncedTabs"> 5015 <a href="/syncedTabs" class="page-item" path="syncedTabs" on-click="onItem Click_">
5016 $i18n{openTabsMenuItem} 5016 $i18n{openTabsMenuItem}
5017 <paper-ripple></paper-ripple> 5017 <paper-ripple></paper-ripple>
5018 </a> 5018 </a>
5019 <div class="separator"></div> 5019 <div class="separator"></div>
5020 <a href="chrome://settings/clearBrowserData" on-tap="onClearBrowsingDataTa p_" id="clear-browsing-data"> 5020 <a href="chrome://settings/clearBrowserData" on-tap="onClearBrowsingDataTa p_" id="clear-browsing-data">
5021 $i18n{clearBrowsingData} 5021 $i18n{clearBrowsingData}
5022 <paper-ripple id="cbd-ripple"></paper-ripple> 5022 <paper-ripple id="cbd-ripple"></paper-ripple>
5023 </a> 5023 </a>
5024 <div id="footer" hidden="[[!showFooter]]"> 5024 <div id="footer" hidden="[[!showFooter]]">
5025 <div class="separator"></div> 5025 <div class="separator"></div>
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
5166 right: 0; 5166 right: 0;
5167 top: 0; 5167 top: 0;
5168 transition: opacity 500ms; 5168 transition: opacity 500ms;
5169 } 5169 }
5170 5170
5171 :host([toolbar-shadow_]) #drop-shadow { 5171 :host([toolbar-shadow_]) #drop-shadow {
5172 opacity: 1; 5172 opacity: 1;
5173 } 5173 }
5174 5174
5175 </style> 5175 </style>
5176 <app-location route="{{route_}}"></app-location> 5176 <history-router selected-page="{{selectedPage_}}" query-state="{{queryState_ }}">
5177 <app-route route="{{route_}}" pattern="/:page" data="{{routeData_}}" query-p arams="{{queryParams_}}"> 5177 </history-router>
5178 </app-route>
5179 <history-toolbar id="toolbar" spinner-active="[[shouldShowSpinner_(queryStat e_.querying, 5178 <history-toolbar id="toolbar" spinner-active="[[shouldShowSpinner_(queryStat e_.querying,
5180 queryState_.incremental, 5179 queryState_.incremental,
5181 queryState_.searchTerm)]]" is-group ed-mode="{{grouped_}}" grouped-range="{{queryState_.range}}" search-term="{{quer yState_.searchTerm}}" query-start-time="[[queryResult_.info.queryStartTime]]" qu ery-end-time="[[queryResult_.info.queryEndTime]]" has-drawer="[[hasDrawer_]]" sh ow-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]"> 5180 queryState_.searchTerm)]]" is-group ed-mode="{{grouped_}}" grouped-range="{{queryState_.range}}" search-term="{{quer yState_.searchTerm}}" query-start-time="[[queryResult_.info.queryStartTime]]" qu ery-end-time="[[queryResult_.info.queryEndTime]]" has-drawer="[[hasDrawer_]]" sh ow-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]">
5182 </history-toolbar> 5181 </history-toolbar>
5183 5182
5184 <div id="main-container"> 5183 <div id="main-container">
5185 <history-side-bar id="content-side-bar" selected-page="[[selectedPage_]]" route="[[route_]]" show-footer="[[showSidebarFooter]]" hidden$="[[hasDrawer_]]"> 5184 <history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" hidden$="[[hasDrawer_]]">
5186 </history-side-bar> 5185 </history-side-bar>
5187 <iron-pages id="content" attr-for-selected="path" fallback-selection="hist ory" selected="[[getSelectedPage_(selectedPage_, items)]]" items="{{items}}"> 5186 <iron-pages id="content" attr-for-selected="path" fallback-selection="hist ory" selected="[[getSelectedPage_(selectedPage_, items)]]" items="{{items}}">
5188 <history-list-container id="history" query-state="{{queryState_}}" query -result="[[queryResult_]]" grouped="[[grouped_]]" grouped-range="{{queryState_.r ange}}" path="history"> 5187 <history-list-container id="history" query-state="{{queryState_}}" query -result="[[queryResult_]]" grouped="[[grouped_]]" grouped-range="{{queryState_.r ange}}" path="history">
5189 </history-list-container> 5188 </history-list-container>
5190 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> 5189 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]">
5191 <history-synced-device-manager id="synced-devices" session-list="[[que ryResult_.sessionList]]" search-term="[[queryState_.searchTerm]]" sign-in-state= "[[isUserSignedIn_]]" path="syncedTabs"> 5190 <history-synced-device-manager id="synced-devices" session-list="[[que ryResult_.sessionList]]" search-term="[[queryState_.searchTerm]]" sign-in-state= "[[isUserSignedIn_]]" path="syncedTabs">
5192 </history-synced-device-manager> 5191 </history-synced-device-manager>
5193 </template> 5192 </template>
5194 </iron-pages> 5193 </iron-pages>
5195 <div id="drop-shadow"></div> 5194 <div id="drop-shadow"></div>
5196 </div> 5195 </div>
5197 5196
5198 <template is="dom-if" if="[[hasDrawer_]]"> 5197 <template is="dom-if" if="[[hasDrawer_]]">
5199 <app-drawer id="drawer" swipe-open="" align="start" tabindex="0"> 5198 <app-drawer id="drawer" swipe-open="" align="start" tabindex="0">
5200 <div id="drawer-header"> 5199 <div id="drawer-header">
5201 <h1>$i18n{title}</h1> 5200 <h1>$i18n{title}</h1>
5202 </div> 5201 </div>
5203 <history-side-bar id="drawer-side-bar" selected-page="[[selectedPage_]]" route="[[route_]]" show-footer="[[showSidebarFooter]]" drawer=""> 5202 <history-side-bar id="drawer-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" drawer="">
5204 </history-side-bar> 5203 </history-side-bar>
5205 </app-drawer> 5204 </app-drawer>
5206 </template> 5205 </template>
5207 5206
5208 <iron-media-query query="(max-width: 1023px)" query-matches="{{hasDrawer_}}" > 5207 <iron-media-query query="(max-width: 1023px)" query-matches="{{hasDrawer_}}" >
5209 </iron-media-query> 5208 </iron-media-query>
5210 </template> 5209 </template>
5211 </dom-module> 5210 </dom-module>
5212 <script src="app.crisper.js"></script></body></html> 5211 <script src="app.crisper.js"></script></body></html>
OLDNEW
« chrome/browser/resources/md_history/app.js ('K') | « chrome/browser/resources/md_history/app.crisper.js ('k') | chrome/browser/resources/md_history/compiled_resources2.gyp » ('j') | chrome/browser/resources/md_history/history_router.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698