ONC import option to chromeos tab in chrome://net-internals

chrome/browser/resources/net_internals/chromeos_view.js

Index: chrome/browser/resources/net_internals/chromeos_view.js
===================================================================
--- chrome/browser/resources/net_internals/chromeos_view.js	(revision 0)
+++ chrome/browser/resources/net_internals/chromeos_view.js	(revision 0)
@@ -0,0 +1,103 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/**
+ * This view displays information on ChromeOS specific features.
+ */
+var CrosView = (function() {
+  'use strict';
+
+  // We inherit from DivView.
+  var superClass = DivView;
+
+  var fileContent;
+  var passcode = '';
+  function importONCFile() {
+    g_browser.importONCFile(fileContent, passcode);
+  }
+
+  function setPasscode(value) {
+    passcode = value;
+    if (passcode) {
+      importONCFile();
+    }
+  }
+
+  function promptForPasscode() {
+    $(CrosView.PASSWORD_ID).hidden = false;
+    $(CrosView.PASSWORD_INPUT_ID).focus();
+    $(CrosView.PASSWORD_INPUT_ID).select();
+  }
+
+  function setFileContent(result) {
+    fileContent = result;
+    // Check if file is encrypted.
+    if (fileContent.search(/begin pgp message/i) == -1) {
+      // Not encrypted, don't need passcode.
+      importONCFile();
+    } else {
+      promptForPasscode();
+    }
+  }
+
+  function addEventListeners() {
+    $(CrosView.IMPORT_ONC_ID).addEventListener('change', function(event) {
+      $(CrosView.PARSE_STATUS_ID).hidden = true;
+      var file = event.target.files[0];
+      var reader = new FileReader();
+      reader.onloadend = function(e) {

[mmenke, 2011/12/02 15:07:55]

You might want to check for read errors here, and display some sort of feedback.
 I'm quite not sure what happens when passing an undefined through chrome.send. 
My guess is that it's treated as a NULL, and nothing unfortunate will happen,
but think it's best to play it safe and not depend on just what happens in that
case.

To be completely robust in the case of funky input, races with loading files and
someone entering a passcode, etc, I'd suggest putting a check for undefined
fileContent in importONCFile.

[achuithb, 2011/12/02 19:49:10]

Handling read errors is not trivial (probably need to add a div with the error
message, figure out the html4 FileReader error handling code, and test), so I'm
going to defer to a subsequent CL if you don't mind.

I've added the test to ensure fileContent is not null, undefined, empty, etc to
importONCFile().

+        setFileContent(this.result);
+      };
+      reader.readAsText(file);
+    }, false);
+
+    $(CrosView.PASSWORD_INPUT_ID).addEventListener('change', function(event) {
+      setPasscode(this.value);
+    }, false);
+  }
+
+  function reset() {
+    fileContent = undefined;
+    passcode = '';
+    $(CrosView.PASSWORD_ID).hidden = true;
+  }
+
+  /**
+   *  @constructor
+   */
+  function CrosView() {
+    assertFirstConstructorCall(CrosView);
+
+    // Call superclass's constructor.
+    superClass.call(this, CrosView.MAIN_BOX_ID);
+
+    g_browser.addCrosONCFileParseObserver(this);
+    addEventListeners();
+  }
+
+  // ID for special HTML element in category_tabs.html
+  CrosView.TAB_HANDLE_ID = 'tab-handle-chromeos';
+
+  CrosView.MAIN_BOX_ID = 'chromeos-view-tab-content';
+  CrosView.IMPORT_ONC_ID = 'chromeos-view-import-onc';
+  CrosView.PASSWORD_ID = 'chromeos-view-password-div';
+  CrosView.PASSWORD_INPUT_ID = 'chromeos-view-onc-password';
+  CrosView.PARSE_STATUS_ID = 'chromeos-view-parse-status';
+
+  cr.addSingletonGetter(CrosView);
+
+  CrosView.prototype = {
+    // Inherit the superclass's methods.
+    __proto__: superClass.prototype,
+
+    onONCFileParse: function(status) {
+      var parseStatus = $(CrosView.PARSE_STATUS_ID);
+      parseStatus.hidden = false;
+      parseStatus.textContent = status;
+      reset();
+    }
+  };
+
+  return CrosView;
+})();
Property changes on: chrome/browser/resources/net_internals/chromeos_view.js
___________________________________________________________________
Added: svn:eol-style
   + LF