[polymer] Merge of master into polymer10-migration

netlog_viewer/chromeos_view.html

Index: netlog_viewer/chromeos_view.html
diff --git a/netlog_viewer/chromeos_view.html b/netlog_viewer/chromeos_view.html
new file mode 100644
index 0000000000000000000000000000000000000000..a845cda1805e79011d5b6f8145a44672dae1d61c
--- /dev/null
+++ b/netlog_viewer/chromeos_view.html
@@ -0,0 +1,52 @@
+<div id="chromeos-view-tab-content" class=content-box>
+  <h4 style='margin-top:0'>Import ONC file</h4>
+  <div id="chromeos-view-import-div">
+    <label>Import ONC File
+      <input type="file" id="chromeos-view-import-onc">
+    </label>
+  </div>
+  <div id="chromeos-view-password-div" hidden>
+    This onc file appears to be encrypted.  Please provide the decryption key:
+    <div>
+      <input type="password" id="chromeos-view-onc-password">
+    </div>
+  </div>
+  <div id="chromeos-view-parse-status" hidden>
+  </div>
+  <div id="chromeos-view-store-debug-logs-div">
+    <h4>Store Logs</h4>
+    <input type="button"
+           id="chromeos-view-store-debug-logs"
+           value="Store Debug Logs">
+    <label for="chromeos-view-store-debug-logs"
+           id="chromeos-view-store-debug-logs-status">
+    </label>
+  </div>
+  <div id="chromeos-view-network-debugging-div">
+    <h4>Network Debugging</h4>
+    <dl>
+      <dt>Select interface for debugging</dt>
+      <dd>
+        <input type="button"
+               value="Wi-Fi"
+               id="chromeos-view-network-debugging-wifi">
+        <input type="button"
+               value="Ethernet"
+               id="chromeos-view-network-debugging-ethernet">
+        <input type="button"
+               value="Cellular"
+               id="chromeos-view-network-debugging-cellular">
+        <input type="button"
+               value="WiMAX"
+               id="chromeos-view-network-debugging-wimax">
+        <input type="button"
+               name="subsystem"
+               value="None"
+               id="chromeos-view-network-debugging-none">
+      </dd>
+    </dl>
+    <label id="chromeos-view-network-debugging-status">
+    </label>
+  </div>
+</div>
+