| 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/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> |
| 4 <link rel="import" href="chrome://history/grouped_list.html"> | 4 <link rel="import" href="chrome://history/grouped_list.html"> |
| 5 <link rel="import" href="chrome://history/history_list.html"> | 5 <link rel="import" href="chrome://history/history_list.html"> |
| 6 <link rel="import" href="chrome://history/history_toolbar.html"> | 6 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 7 <link rel="import" href="chrome://history/synced_device_manager.html"> | 7 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 8 <link rel="import" href="chrome://history/side_bar.html"> | 8 <link rel="import" href="chrome://history/side_bar.html"> |
| 9 <link rel="import" href="chrome://history/shared_style.html"> | 9 <link rel="import" href="chrome://history/shared_style.html"> |
| 10 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 10 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 history-grouped-list { | 35 history-grouped-list { |
| 36 flex: 1 0 0; | 36 flex: 1 0 0; |
| 37 } | 37 } |
| 38 | 38 |
| 39 #content { | 39 #content { |
| 40 display: flex; | 40 display: flex; |
| 41 flex: 1 0 0; | 41 flex: 1 0 0; |
| 42 overflow: hidden; | 42 overflow: hidden; |
| 43 } | 43 } |
| 44 </style> | 44 </style> |
| 45 <history-toolbar id="toolbar" searching="[[queryState_.querying]]" | 45 <history-toolbar id="toolbar" |
| 46 spinner-active="[[shouldShowSpinner_(queryState_.querying, |
| 47 queryState_.incremental, |
| 48 queryState_.searchTerm)]]" |
| 46 is-grouped-mode="{{grouped_}}" | 49 is-grouped-mode="{{grouped_}}" |
| 47 grouped-range="{{queryState_.range}}" | 50 grouped-range="{{queryState_.range}}" |
| 48 search-term="{{queryState_.searchTerm}}" | 51 search-term="{{queryState_.searchTerm}}" |
| 49 query-start-time="[[queryState_.info.queryStartTime]]" | 52 query-start-time="[[queryState_.info.queryStartTime]]" |
| 50 query-end-time="[[queryState_.info.queryEndTime]]"> | 53 query-end-time="[[queryState_.info.queryEndTime]]"> |
| 51 </history-toolbar> | 54 </history-toolbar> |
| 52 | 55 |
| 53 <div id="main-container"> | 56 <div id="main-container"> |
| 54 <history-side-bar id="history-side-bar" selected-page="{{selectedPage_}}"> | 57 <history-side-bar id="history-side-bar" selected-page="{{selectedPage_}}"> |
| 55 </history-side-bar> | 58 </history-side-bar> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 68 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 71 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
| 69 <history-synced-device-manager id="history-synced-device-manager" | 72 <history-synced-device-manager id="history-synced-device-manager" |
| 70 session-list="[[queryState_.sessionList]]"> | 73 session-list="[[queryState_.sessionList]]"> |
| 71 </history-synced-device-manager> | 74 </history-synced-device-manager> |
| 72 </template> | 75 </template> |
| 73 </iron-pages> | 76 </iron-pages> |
| 74 </div> | 77 </div> |
| 75 </template> | 78 </template> |
| 76 <script src="chrome://history/app.js"></script> | 79 <script src="chrome://history/app.js"></script> |
| 77 </dom-module> | 80 </dom-module> |
| OLD | NEW |