Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: chrome/browser/resources/md_history/history.html

Issue 1607403004: MD History: Display synced tabs history (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@second_patch
Patch Set: Merged but tests not working everything else SEEMS ok Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/md_history/history.html
diff --git a/chrome/browser/resources/md_history/history.html b/chrome/browser/resources/md_history/history.html
index 4cdb80566f5fd1301871c17703ab59a5f4d01dad..cab2b1fb7495ebc22f89c292a951db786919dddb 100644
--- a/chrome/browser/resources/md_history/history.html
+++ b/chrome/browser/resources/md_history/history.html
@@ -30,12 +30,27 @@
flex: 1 0 0;
overflow: auto;
}
+
+ #synced-device-manager {
+ flex: 1 0 0;
+ padding-top: 40px;
+ }
+
+ #history-panel {
+ display: flex;
+ overflow: hidden;
+ }
</style>
</head>
<body>
<history-toolbar class="paper-header" id="toolbar"></history-toolbar>
- <history-list id="history-list"></history-list>
+ <div id="history-panel">
+ <side-bar id="side-bar"></side-bar>
+ <history-list id="history-list"></history-list>
+ <synced-device-manager id="synced-device-manager" hidden>
+ </synced-device-manager>
+ </div>
<link rel="import" href="chrome://resources/html/polymer_config.html">
<link rel="import" href="chrome://resources/html/cr.html">
@@ -45,6 +60,8 @@
<link rel="import" href="chrome://history/history_list.html">
<link rel="import" href="chrome://history/history_toolbar.html">
+ <link rel="import" href="chrome://history/synced_device_manager.html">
+ <link rel="import" href="chrome://history/side_bar.html">
<script src="history.js"></script>
« no previous file with comments | « chrome/browser/resources/md_history/compiled_resources.gyp ('k') | chrome/browser/resources/md_history/history.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698