summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/net_internals/chromeos_view.html
diff options
context:
space:
mode:
authorachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-05 01:34:34 +0000
committerachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-05 01:34:34 +0000
commit34c6ef8c58c3df0d124439919f2a9034c5471978 (patch)
tree5d65b3d5bc2381832a3cd383075dee93cff6fb8f /chrome/browser/resources/net_internals/chromeos_view.html
parent7714cb32c8694e3798a5be3aa7fdcdf924080ac5 (diff)
downloadchromium_src-34c6ef8c58c3df0d124439919f2a9034c5471978.zip
chromium_src-34c6ef8c58c3df0d124439919f2a9034c5471978.tar.gz
chromium_src-34c6ef8c58c3df0d124439919f2a9034c5471978.tar.bz2
ONC import option to chromeos tab in chrome://net-internals
Add chromeos tab to chrome://net-internals. Move ONC file import input field to chromeos tab, from network options. Support for encrypted onc files. Fix net_internals browser test. BUG=chromium-os:23472,chromium-os:19397 TEST=Go to chrome://net-internals, click on chromeos tab. Should be able to import an onc file from there. If the file is encrypted, should be prompted for a passcode. Review URL: http://codereview.chromium.org/8741009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/net_internals/chromeos_view.html')
-rw-r--r--chrome/browser/resources/net_internals/chromeos_view.html12
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/resources/net_internals/chromeos_view.html b/chrome/browser/resources/net_internals/chromeos_view.html
new file mode 100644
index 0000000..b985ee2
--- /dev/null
+++ b/chrome/browser/resources/net_internals/chromeos_view.html
@@ -0,0 +1,12 @@
+<div id="chromeos-view-tab-content">
+ <h3>Import ONC file</h3>
+ <input type="file" id="chromeos-view-import-onc">
+ <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>