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-route/app-location.
html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-route.htm
l"> |
4 <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"> |
5 <link rel="import" href="chrome://history/history_toolbar.html"> | 7 <link rel="import" href="chrome://history/history_toolbar.html"> |
6 <link rel="import" href="chrome://history/list_container.html"> | 8 <link rel="import" href="chrome://history/list_container.html"> |
7 <link rel="import" href="chrome://history/synced_device_manager.html"> | 9 <link rel="import" href="chrome://history/synced_device_manager.html"> |
8 <link rel="import" href="chrome://history/side_bar.html"> | 10 <link rel="import" href="chrome://history/side_bar.html"> |
9 <link rel="import" href="chrome://history/shared_style.html"> | 11 <link rel="import" href="chrome://history/shared_style.html"> |
10 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 12 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
11 | 13 |
12 <dom-module id="history-app"> | 14 <dom-module id="history-app"> |
13 <template> | 15 <template> |
(...skipping 17 matching lines...) Expand all Loading... |
31 | 33 |
32 :host([grouped_]) #main-container { | 34 :host([grouped_]) #main-container { |
33 height: calc(100% - var(--toolbar-grouped-height)); | 35 height: calc(100% - var(--toolbar-grouped-height)); |
34 } | 36 } |
35 | 37 |
36 #content, | 38 #content, |
37 #content > * { | 39 #content > * { |
38 height: 100%; | 40 height: 100%; |
39 } | 41 } |
40 </style> | 42 </style> |
| 43 <app-location route="{{route_}}"></app-location> |
| 44 <app-route route="{{route_}}" pattern="/:page" data="{{routeData_}}"> |
| 45 </app-route> |
41 <history-toolbar id="toolbar" | 46 <history-toolbar id="toolbar" |
42 spinner-active="[[shouldShowSpinner_(queryState_.querying, | 47 spinner-active="[[shouldShowSpinner_(queryState_.querying, |
43 queryState_.incremental, | 48 queryState_.incremental, |
44 queryState_.searchTerm)]]" | 49 queryState_.searchTerm)]]" |
45 is-grouped-mode="{{grouped_}}" | 50 is-grouped-mode="{{grouped_}}" |
46 grouped-range="{{queryState_.range}}" | 51 grouped-range="{{queryState_.range}}" |
47 search-term="{{queryState_.searchTerm}}" | 52 search-term="{{queryState_.searchTerm}}" |
48 query-start-time="[[queryResult_.info.queryStartTime]]" | 53 query-start-time="[[queryResult_.info.queryStartTime]]" |
49 query-end-time="[[queryResult_.info.queryEndTime]]"> | 54 query-end-time="[[queryResult_.info.queryEndTime]]"> |
50 </history-toolbar> | 55 </history-toolbar> |
51 | 56 |
52 <div id="main-container"> | 57 <div id="main-container"> |
53 <iron-pages id="content" attr-for-selected="id" | 58 <iron-pages id="content" attr-for-selected="path" |
54 selected="[[selectedPage_]]"> | 59 fallback-selection="history" |
| 60 selected="[[getSelectedPage_(selectedPage_, items)]]" |
| 61 items="{{items}}"> |
55 <history-list-container id="history" query-state="{{queryState_}}" | 62 <history-list-container id="history" query-state="{{queryState_}}" |
56 query-result="[[queryResult_]]" grouped="[[grouped_]]"> | 63 query-result="[[queryResult_]]" grouped="[[grouped_]]" |
| 64 path="history"> |
57 </history-list-container> | 65 </history-list-container> |
58 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 66 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
59 <history-synced-device-manager id="synced-devices" | 67 <history-synced-device-manager id="synced-devices" |
60 session-list="[[queryResult_.sessionList]]" | 68 session-list="[[queryResult_.sessionList]]" |
61 searched-term=[[queryState_.searchTerm]]> | 69 searched-term=[[queryState_.searchTerm]] |
| 70 path="syncedTabs"> |
62 </history-synced-device-manager> | 71 </history-synced-device-manager> |
63 </template> | 72 </template> |
64 </iron-pages> | 73 </iron-pages> |
65 </div> | 74 </div> |
66 | 75 |
67 <history-side-bar id="side-bar" selected-page="{{selectedPage_}}"> | 76 <history-side-bar id="side-bar" selected-page="[[selectedPage_]]"> |
68 </history-side-bar> | 77 </history-side-bar> |
69 </template> | 78 </template> |
70 <script src="chrome://history/app.js"></script> | 79 <script src="chrome://history/app.js"></script> |
71 </dom-module> | 80 </dom-module> |
OLD | NEW |