| 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/history_list.html"> | 4 <link rel="import" href="chrome://history/history_list.html"> |
| 5 <link rel="import" href="chrome://history/history_toolbar.html"> | 5 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 6 <link rel="import" href="chrome://history/synced_device_manager.html"> | 6 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 7 <link rel="import" href="chrome://history/side_bar.html"> | 7 <link rel="import" href="chrome://history/side_bar.html"> |
| 8 <link rel="import" href="chrome://history/shared_style.html"> | 8 <link rel="import" href="chrome://history/shared_style.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/carbon-route/carbon-loc
ation.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/carbon-route/carbon-rou
te.html"> |
| 9 | 11 |
| 10 <dom-module id="history-app"> | 12 <dom-module id="history-app"> |
| 11 <!-- TODO(calamity): work around this deprecated import style --> | 13 <!-- TODO(calamity): work around this deprecated import style --> |
| 12 <link rel="import" type="css" href="chrome://resources/css/md_colors.css"> | 14 <link rel="import" type="css" href="chrome://resources/css/md_colors.css"> |
| 13 <template> | 15 <template> |
| 14 <style include="shared-style"> | 16 <style include="shared-style"> |
| 15 :host { | 17 :host { |
| 16 display: flex; | 18 display: flex; |
| 17 flex-direction: column; | 19 flex-direction: column; |
| 18 min-width: 800px; | 20 min-width: 800px; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 35 | 37 |
| 36 #content { | 38 #content { |
| 37 display: flex; | 39 display: flex; |
| 38 flex: 1 0 0; | 40 flex: 1 0 0; |
| 39 } | 41 } |
| 40 | 42 |
| 41 history-toolbar { | 43 history-toolbar { |
| 42 background: var(--md-toolbar-color); | 44 background: var(--md-toolbar-color); |
| 43 } | 45 } |
| 44 </style> | 46 </style> |
| 47 <carbon-location route="{{route}}"></carbon-location> |
| 48 <carbon-route route="{{route}}" pattern="/:page" data="{{routeData}}"></carb
on-route> |
| 49 |
| 45 <history-toolbar class="paper-header" id="toolbar"></history-toolbar> | 50 <history-toolbar class="paper-header" id="toolbar"></history-toolbar> |
| 46 | 51 |
| 47 <div id="main-container"> | 52 <div id="main-container"> |
| 48 <history-side-bar id="history-side-bar" selected-page="{{selectedPage}}"> | 53 <history-side-bar id="history-side-bar" selected-page="{{selectedPage}}" r
oute="{{route}}"> |
| 49 </history-side-bar> | 54 </history-side-bar> |
| 50 <iron-pages id="content" attr-for-selected="id" | 55 <iron-pages id="content" attr-for-selected="id" |
| 51 selected="{{selectedPage}}"> | 56 selected="{{selectedPage}}"> |
| 52 <history-list id="history-list"></history-list> | 57 <history-list id="history-list"></history-list> |
| 53 <history-synced-device-manager id="history-synced-device-manager"> | 58 <history-synced-device-manager id="history-synced-device-manager"> |
| 54 </history-synced-device-manager> | 59 </history-synced-device-manager> |
| 55 </iron-pages> | 60 </iron-pages> |
| 56 </div> | 61 </div> |
| 57 </template> | 62 </template> |
| 58 <script src="chrome://history/app.js"></script> | 63 <script src="chrome://history/app.js"></script> |
| 59 </dom-module> | 64 </dom-module> |
| OLD | NEW |