Bring the gh-pages branch up to date with the master branch

netlog_viewer/prerender_view.html

Index: netlog_viewer/prerender_view.html
diff --git a/netlog_viewer/prerender_view.html b/netlog_viewer/prerender_view.html
new file mode 100644
index 0000000000000000000000000000000000000000..ce3b10fe24f7e751cdf5783d995ecb3a6f314cf7
--- /dev/null
+++ b/netlog_viewer/prerender_view.html
@@ -0,0 +1,46 @@
+<style>
+
+#prerender-view-history-table tr.used {
+  background-color: #F0FFF0;
+}
+
+#prerender-view-history-table tr:not(.used) {
+  background-color: #FFF0F0;
+}
+
+</style>
+
+<div id=prerender-view-tab-content class=content-box>
+  <ul style='margin-top:0'>
+    <li>Prerender Enabled:
+      <span id=prerender-view-enabled></span>
+      <span id=prerender-view-enabled-note></span></li>
+    <li>Prerender Omnibox Enabled:
+      <span id=prerender-view-omnibox-enabled></span></li>
+  </ul>
+  <h4>Active Prerender Pages</h4>
+  <table class="styled-table">
+    <thead>
+      <tr>
+        <th>URL</th>
+        <th>Duration</th>
+        <th>Loaded</th>
+      </tr>
+    </thead>
+    <tbody id=prerender-view-active-table>
+    </tbody>
+  </table>
+  <h4>Prerender History</h4>
+  <table class="styled-table">
+    <thead>
+      <tr>
+        <th>Origin</th>
+        <th>URL</th>
+        <th>Final Status</th>
+        <th>Time</th>
+      </tr>
+    </thead>
+    <tbody id=prerender-view-history-table>
+    </tbody>
+  </table>
+</div>