Compile chrome://settings, part 6

chrome/browser/resources/options/chromeos/internet_detail.js

 // Copyright (c) 2012 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.
 
 // require: onc_data.js
 
 // NOTE(stevenjb): This code is in the process of being converted to be
 // compatible with the networkingPrivate extension API:
 // * The network property dictionaries are being converted to use ONC values.
 // * chrome.send calls will be replaced with an API object that simulates the
@@ skipping 369 matching lines @@
      */
     handleNameServerTypeChange_: function(event) {
       var type = event.target.value;
       DetailsInternetPage.updateNameServerDisplay(type);
     },
 
     /**
      * Creates an indicator event for controlled properties using
      * the same dictionary format as CoreOptionsHandler::CreateValueForPref.
      * @param {string} name The name for the Event.
-     * @param {!{value: *, controlledBy: *, recommendedValue: *}} propData
-     *     Property dictionary,
+     * @param {{value: *, controlledBy: *, recommendedValue: *}} propData
+     *     Property dictionary.
      * @private
      */
     createControlledEvent_: function(name, propData) {
+      assert('value' in propData && 'controlledBy' in propData &&
+             'recommendedValue' in propData);
       var event = new Event(name);
       event.value = {
         value: propData.value,
         controlledBy: propData.controlledBy,
         recommendedValue: propData.recommendedValue
       };
       return event;
     },
 
     /**
@@ skipping 1157 matching lines @@
       var managed = indicators[i].hasAttribute('managed');
       var attributeName = managed ? 'managed' : 'data';
       var propName = indicators[i].getAttribute(attributeName);
       if (!propName)
         continue;
       var propValue = managed ?
           onc.getManagedProperty(propName) :
           onc.getActiveValue(propName);
       if (propValue == undefined)
         continue;
+      propValue = assertInstanceof(propValue, Object);

[stevenjb, 2014/11/05 20:30:15]

While I do appreciate this effort, this actually introduced a subtle bug causing
the details page not to load at all. If you could include me on the review of
any internet options related changes in the future I may be able to catch these
in advance. (FYI, fix is here: https://codereview.chromium.org/701243002/).
Thanks!

       var event;
       if (managed)
         event = detailsPage.createManagedEvent_(propName, propValue);
       else
-        event = detailsPage.createControlledEvent_(propName, propValue);
+        event = detailsPage.createControlledEvent_(propName,
+            /** @type {{value: *, controlledBy: *, recommendedValue: *}} */(
+                propValue));
       indicators[i].handlePrefChange(event);
       var forElement = $(indicators[i].getAttribute('for'));
       if (forElement) {
         if (event.value.controlledBy == 'policy')
           forElement.disabled = true;
         if (forElement.resetHandler)
           indicators[i].resetHandler = forElement.resetHandler;
       }
     }
 
     detailsPage.updateControls();
 
     // Don't show page name in address bar and in history to prevent people
     // navigate here by hand and solve issue with page session restore.
     PageManager.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });