| 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/iron-media-query/iron-m
edia-query.html"> | 4 <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-pages/iron-pages.h
tml"> | 5 <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-scroll-target-beha
vior/iron-scroll-target-behavior.html"> | 6 <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://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/query_manager.html"> | 9 <link rel="import" href="chrome://history/query_manager.html"> |
| 10 <link rel="import" href="chrome://history/router.html"> | 10 <link rel="import" href="chrome://history/router.html"> |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 background: var(--md-toolbar-color); | 28 background: var(--md-toolbar-color); |
| 29 } | 29 } |
| 30 | 30 |
| 31 /* Sizing this with flex causes slow load performance, see | 31 /* Sizing this with flex causes slow load performance, see |
| 32 * crbug.com/618153. TODO(dbeam): is this still an issue? */ | 32 * crbug.com/618153. TODO(dbeam): is this still an issue? */ |
| 33 #main-container { | 33 #main-container { |
| 34 height: calc(100% - var(--toolbar-height)); | 34 height: calc(100% - var(--toolbar-height)); |
| 35 position: relative; | 35 position: relative; |
| 36 } | 36 } |
| 37 | 37 |
| 38 :host([grouped_]) #main-container { | |
| 39 height: calc(100% - var(--toolbar-grouped-height)); | |
| 40 } | |
| 41 | |
| 42 #content-side-bar { | 38 #content-side-bar { |
| 43 float: left; | 39 float: left; |
| 44 } | 40 } |
| 45 | 41 |
| 46 :host-context([dir='rtl']) #content-side-bar { | 42 :host-context([dir='rtl']) #content-side-bar { |
| 47 float: right; | 43 float: right; |
| 48 } | 44 } |
| 49 | 45 |
| 50 #content, | 46 #content, |
| 51 #content > * { | 47 #content > * { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 67 :host([toolbar-shadow_]) #drop-shadow { | 63 :host([toolbar-shadow_]) #drop-shadow { |
| 68 opacity: 1; | 64 opacity: 1; |
| 69 } | 65 } |
| 70 </style> | 66 </style> |
| 71 <history-query-manager query-state="{{queryState_}}" | 67 <history-query-manager query-state="{{queryState_}}" |
| 72 query-result="[[queryResult_]]" | 68 query-result="[[queryResult_]]" |
| 73 router="[[$$('#router')]]"> | 69 router="[[$$('#router')]]"> |
| 74 </history-query-manager> | 70 </history-query-manager> |
| 75 <history-router id="router" | 71 <history-router id="router" |
| 76 selected-page="{{selectedPage_}}" | 72 selected-page="{{selectedPage_}}" |
| 77 grouped="[[grouped_]]" | |
| 78 query-state="[[queryState_]]"> | 73 query-state="[[queryState_]]"> |
| 79 </history-router> | 74 </history-router> |
| 80 <history-toolbar id="toolbar" | 75 <history-toolbar id="toolbar" |
| 81 grouped-offset="[[queryState_.groupedOffset]]" | |
| 82 grouped-range="[[queryState_.range]]" | |
| 83 has-drawer="[[hasDrawer_]]" | 76 has-drawer="[[hasDrawer_]]" |
| 84 has-more-results="[[!queryResult_.info.finished]]" | 77 has-more-results="[[!queryResult_.info.finished]]" |
| 85 is-grouped-mode="[[grouped_]]" | |
| 86 query-info="[[queryResult_.info]]" | 78 query-info="[[queryResult_.info]]" |
| 87 querying="[[queryState_.querying]]" | 79 querying="[[queryState_.querying]]" |
| 88 search-term="[[queryState_.searchTerm]]" | 80 search-term="[[queryState_.searchTerm]]" |
| 89 show-grouped-controls="[[!syncedTabsSelected_(selectedPage_)]]" | |
| 90 show-menu-promo="[[showMenuPromo_]]" | 81 show-menu-promo="[[showMenuPromo_]]" |
| 91 show-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]" | 82 show-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]" |
| 92 spinner-active="[[shouldShowSpinner_(queryState_.querying, | 83 spinner-active="[[shouldShowSpinner_(queryState_.querying, |
| 93 queryState_.incremental, | 84 queryState_.incremental, |
| 94 queryState_.searchTerm)]]"> | 85 queryState_.searchTerm)]]"> |
| 95 </history-toolbar> | 86 </history-toolbar> |
| 96 | 87 |
| 97 <div id="main-container"> | 88 <div id="main-container"> |
| 98 <history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" | 89 <history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" |
| 99 show-footer="[[showSidebarFooter]]" | 90 show-footer="[[showSidebarFooter]]" |
| 100 hidden$="[[hasDrawer_]]"> | 91 hidden$="[[hasDrawer_]]"> |
| 101 </history-side-bar> | 92 </history-side-bar> |
| 102 <iron-pages id="content" attr-for-selected="path" | 93 <iron-pages id="content" attr-for-selected="path" |
| 103 fallback-selection="history" | 94 fallback-selection="history" |
| 104 selected="[[getSelectedPage_(selectedPage_, items)]]" | 95 selected="[[getSelectedPage_(selectedPage_, items)]]" |
| 105 items="{{items}}"> | 96 items="{{items}}"> |
| 106 <history-list-container id="history" query-state="[[queryState_]]" | 97 <history-list-container id="history" query-state="[[queryState_]]" |
| 107 query-result="[[queryResult_]]" grouped="[[grouped_]]" | 98 query-result="[[queryResult_]]" path="history"> |
| 108 path="history"> | |
| 109 </history-list-container> | 99 </history-list-container> |
| 110 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 100 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
| 111 <history-synced-device-manager id="synced-devices" | 101 <history-synced-device-manager id="synced-devices" |
| 112 session-list="[[queryResult_.sessionList]]" | 102 session-list="[[queryResult_.sessionList]]" |
| 113 search-term="[[queryState_.searchTerm]]" | 103 search-term="[[queryState_.searchTerm]]" |
| 114 sign-in-state="[[isUserSignedIn_]]" | 104 sign-in-state="[[isUserSignedIn_]]" |
| 115 path="syncedTabs"> | 105 path="syncedTabs"> |
| 116 </history-synced-device-manager> | 106 </history-synced-device-manager> |
| 117 </template> | 107 </template> |
| 118 </iron-pages> | 108 </iron-pages> |
| 119 <div id="drop-shadow"></div> | 109 <div id="drop-shadow"></div> |
| 120 </div> | 110 </div> |
| 121 | 111 |
| 122 <template is="cr-lazy-render" id="drawer"> | 112 <template is="cr-lazy-render" id="drawer"> |
| 123 <dialog is="cr-drawer" swipe-open> | 113 <dialog is="cr-drawer" swipe-open> |
| 124 <div class="drawer-header">$i18n{title}</div> | 114 <div class="drawer-header">$i18n{title}</div> |
| 125 <history-side-bar id="drawer-side-bar" class="drawer-content" | 115 <history-side-bar id="drawer-side-bar" class="drawer-content" |
| 126 selected-page="{{selectedPage_}}" | 116 selected-page="{{selectedPage_}}" |
| 127 show-footer="[[showSidebarFooter]]"> | 117 show-footer="[[showSidebarFooter]]"> |
| 128 </history-side-bar> | 118 </history-side-bar> |
| 129 </dialog> | 119 </dialog> |
| 130 </template> | 120 </template> |
| 131 | 121 |
| 132 <iron-media-query query="(max-width: 1023px)" | 122 <iron-media-query query="(max-width: 1023px)" |
| 133 query-matches="{{hasDrawer_}}"> | 123 query-matches="{{hasDrawer_}}"> |
| 134 </iron-media-query> | 124 </iron-media-query> |
| 135 </template> | 125 </template> |
| 136 <script src="chrome://history/app.js"></script> | 126 <script src="chrome://history/app.js"></script> |
| 137 </dom-module> | 127 </dom-module> |
| OLD | NEW |