[polymer] Merge of master into polymer10-migration

netlog_viewer/modules_view.html

Index: netlog_viewer/modules_view.html
diff --git a/netlog_viewer/modules_view.html b/netlog_viewer/modules_view.html
new file mode 100644
index 0000000000000000000000000000000000000000..56094c8d4b40839585358e93b0f371a4efc71d0d
--- /dev/null
+++ b/netlog_viewer/modules_view.html
@@ -0,0 +1,90 @@
+<style>
+
+.modules-view-extension-list tr.enabled {
+  background-color: #F0FFF0;
+}
+
+.modules-view-extension-list tr:not(.enabled) {
+  background-color: #FFF0F0;
+}
+
+</style>
+
+<div id=modules-view-tab-content class=content-box>
+  <h4 style='margin-top:0'>Chrome Extensions</h4>
+  <div id="modules-view-extension-info">
+    <div jsdisplay="typeof extensionInfo == 'undefined'">No information</div>
+    <div jsdisplay="typeof extensionInfo != 'undefined' && extensionInfo.length == 0">None</div>
+    <div jsdisplay="typeof extensionInfo != 'undefined' && extensionInfo.length != 0">
+      <table class=styled-table>
+        <thead>
+          <tr>
+            <th>ID</th>
+            <th>App</th>
+            <th>Enabled</th>
+            <th>Name</th>
+            <th>Version</th>
+            <th>Description</th>
+          </tr>
+        </thead>
+        <tbody class=modules-view-extension-list>
+          <tr jsselect="extensionInfo" jsvalues=".className: enabled ? 'enabled' : ''">
+            <td jscontent="id"></td>
+            <td jscontent="packagedApp"></td>
+            <td jscontent="enabled"></td>
+            <td jscontent="name"></td>
+            <td jscontent="version"></td>
+            <td jscontent="description"></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+
+  <!-- Only shown for Windows log dumps -->
+  <div id=modules-view-windows-service-providers style="display: none;"
+      jsdisplay="typeof $this != 'undefined'">
+    <h4>Layered Service Providers</h4>
+    <table class="styled-table">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Version</th>
+          <th>Type</th>
+          <th>Socket Type</th>
+          <th>Protocol</th>
+          <th>Path</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr jsselect="service_providers">
+          <td jscontent="name"></td>
+          <td jscontent="version"></td>
+          <td jscontent="ModulesView.getLayeredServiceProviderType($this)"></td>
+          <td jscontent="ModulesView.getLayeredServiceProviderSocketType($this)"></td>
+          <td jscontent="ModulesView.getLayeredServiceProviderProtocolType($this)"></td>
+          <td jscontent="path"></td>
+        </tr>
+      </tbody>
+    </table>
+    <h4>Namespace Providers</h4>
+    <table class="styled-table">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Version</th>
+          <th>Namespace</th>
+          <th>Active</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr jsselect="namespace_providers">
+          <td jscontent="name"></td>
+          <td jscontent="version"></td>
+          <td jscontent="ModulesView.getNamespaceProviderType($this)"></td>
+          <td jscontent="active"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>