Chromium Code Reviews| OLD | NEW |
|---|---|
| 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-layout/app-drawer/a pp-drawer.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a pp-drawer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-location. html"> | |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-route.htm l"> | |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-media-query/iron-m edia-query.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-media-query/iron-m edia-query.html"> |
| 8 <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"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-scroll-target-beha vior/iron-scroll-target-behavior.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-scroll-target-beha vior/iron-scroll-target-behavior.html"> |
| 8 <link rel="import" href="chrome://history/history_router.html"> | |
|
calamity
2016/09/22 05:12:26
I thought we were going to stop prefixing everythi
tsergeant
2016/09/22 23:57:42
True. Renamed to router.html
| |
| 10 <link rel="import" href="chrome://history/history_toolbar.html"> | 9 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 11 <link rel="import" href="chrome://history/list_container.html"> | 10 <link rel="import" href="chrome://history/list_container.html"> |
| 12 <link rel="import" href="chrome://history/synced_device_manager.html"> | 11 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 13 <link rel="import" href="chrome://history/side_bar.html"> | 12 <link rel="import" href="chrome://history/side_bar.html"> |
| 14 <link rel="import" href="chrome://history/shared_style.html"> | 13 <link rel="import" href="chrome://history/shared_style.html"> |
| 15 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 14 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
| 16 | 15 |
| 17 <dom-module id="history-app"> | 16 <dom-module id="history-app"> |
| 18 <template> | 17 <template> |
| 19 <style no-process> | 18 <style no-process> |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 position: absolute; | 75 position: absolute; |
| 77 right: 0; | 76 right: 0; |
| 78 top: 0; | 77 top: 0; |
| 79 transition: opacity 500ms; | 78 transition: opacity 500ms; |
| 80 } | 79 } |
| 81 | 80 |
| 82 :host([toolbar-shadow_]) #drop-shadow { | 81 :host([toolbar-shadow_]) #drop-shadow { |
| 83 opacity: 1; | 82 opacity: 1; |
| 84 } | 83 } |
| 85 </style> | 84 </style> |
| 86 <app-location route="{{route_}}"></app-location> | 85 <history-router selected-page="{{selectedPage_}}" |
| 87 <app-route route="{{route_}}" pattern="/:page" data="{{routeData_}}" | 86 query-state="{{queryState_}}"> |
| 88 query-params="{{queryParams_}}"> | 87 </history-router> |
| 89 </app-route> | |
| 90 <history-toolbar id="toolbar" | 88 <history-toolbar id="toolbar" |
| 91 spinner-active="[[shouldShowSpinner_(queryState_.querying, | 89 spinner-active="[[shouldShowSpinner_(queryState_.querying, |
| 92 queryState_.incremental, | 90 queryState_.incremental, |
| 93 queryState_.searchTerm)]]" | 91 queryState_.searchTerm)]]" |
| 94 is-grouped-mode="{{grouped_}}" | 92 is-grouped-mode="{{grouped_}}" |
| 95 grouped-range="{{queryState_.range}}" | 93 grouped-range="{{queryState_.range}}" |
| 96 search-term="{{queryState_.searchTerm}}" | 94 search-term="{{queryState_.searchTerm}}" |
| 97 query-start-time="[[queryResult_.info.queryStartTime]]" | 95 query-start-time="[[queryResult_.info.queryStartTime]]" |
| 98 query-end-time="[[queryResult_.info.queryEndTime]]" | 96 query-end-time="[[queryResult_.info.queryEndTime]]" |
| 99 has-drawer="[[hasDrawer_]]" | 97 has-drawer="[[hasDrawer_]]" |
| 100 show-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]"> | 98 show-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]"> |
| 101 </history-toolbar> | 99 </history-toolbar> |
| 102 | 100 |
| 103 <div id="main-container"> | 101 <div id="main-container"> |
| 104 <history-side-bar id="content-side-bar" selected-page="[[selectedPage_]]" | 102 <history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" |
| 105 route="[[route_]]" show-footer="[[showSidebarFooter]]" | 103 show-footer="[[showSidebarFooter]]" |
| 106 hidden$="[[hasDrawer_]]"> | 104 hidden$="[[hasDrawer_]]"> |
| 107 </history-side-bar> | 105 </history-side-bar> |
| 108 <iron-pages id="content" attr-for-selected="path" | 106 <iron-pages id="content" attr-for-selected="path" |
| 109 fallback-selection="history" | 107 fallback-selection="history" |
| 110 selected="[[getSelectedPage_(selectedPage_, items)]]" | 108 selected="[[getSelectedPage_(selectedPage_, items)]]" |
| 111 items="{{items}}"> | 109 items="{{items}}"> |
| 112 <history-list-container id="history" query-state="{{queryState_}}" | 110 <history-list-container id="history" query-state="{{queryState_}}" |
| 113 query-result="[[queryResult_]]" grouped="[[grouped_]]" | 111 query-result="[[queryResult_]]" grouped="[[grouped_]]" |
| 114 grouped-range="{{queryState_.range}}" path="history"> | 112 grouped-range="{{queryState_.range}}" path="history"> |
| 115 </history-list-container> | 113 </history-list-container> |
| 116 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 114 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
| 117 <history-synced-device-manager id="synced-devices" | 115 <history-synced-device-manager id="synced-devices" |
| 118 session-list="[[queryResult_.sessionList]]" | 116 session-list="[[queryResult_.sessionList]]" |
| 119 search-term="[[queryState_.searchTerm]]" | 117 search-term="[[queryState_.searchTerm]]" |
| 120 sign-in-state="[[isUserSignedIn_]]" | 118 sign-in-state="[[isUserSignedIn_]]" |
| 121 path="syncedTabs"> | 119 path="syncedTabs"> |
| 122 </history-synced-device-manager> | 120 </history-synced-device-manager> |
| 123 </template> | 121 </template> |
| 124 </iron-pages> | 122 </iron-pages> |
| 125 <div id="drop-shadow"></div> | 123 <div id="drop-shadow"></div> |
| 126 </div> | 124 </div> |
| 127 | 125 |
| 128 <template is="dom-if" if="[[hasDrawer_]]"> | 126 <template is="dom-if" if="[[hasDrawer_]]"> |
| 129 <app-drawer id="drawer" swipe-open align="start" tabindex="0"> | 127 <app-drawer id="drawer" swipe-open align="start" tabindex="0"> |
| 130 <div id="drawer-header"> | 128 <div id="drawer-header"> |
| 131 <h1>$i18n{title}</h1> | 129 <h1>$i18n{title}</h1> |
| 132 </div> | 130 </div> |
| 133 <history-side-bar id="drawer-side-bar" selected-page="[[selectedPage_]]" | 131 <history-side-bar id="drawer-side-bar" selected-page="{{selectedPage_}}" |
| 134 route="[[route_]]" show-footer="[[showSidebarFooter]]" drawer> | 132 show-footer="[[showSidebarFooter]]" drawer> |
| 135 </history-side-bar> | 133 </history-side-bar> |
| 136 </app-drawer> | 134 </app-drawer> |
| 137 </template> | 135 </template> |
| 138 | 136 |
| 139 <iron-media-query query="(max-width: 1023px)" | 137 <iron-media-query query="(max-width: 1023px)" |
| 140 query-matches="{{hasDrawer_}}"> | 138 query-matches="{{hasDrawer_}}"> |
| 141 </iron-media-query> | 139 </iron-media-query> |
| 142 </template> | 140 </template> |
| 143 <script src="chrome://history/app.js"></script> | 141 <script src="chrome://history/app.js"></script> |
| 144 </dom-module> | 142 </dom-module> |
| OLD | NEW |