Print Preview: Fix data/ errors

chrome/browser/resources/print_preview/data/destination_store.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.
 
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * A data store that stores destinations and dispatches events when the data
    * store changes.
-   * @param {!Array<!print_preview.Destination.Origin>} origins Match
-   *     destinations from these origins.
-   * @param {RegExp} idRegExp Match destination's id.
-   * @param {RegExp} displayNameRegExp Match destination's displayName.
-   * @param {boolean} skipVirtualDestinations Whether to ignore virtual
-   *     destinations, for example, Save as PDF.
-   * @constructor
-   */
-  function DestinationMatch(
-      origins, idRegExp, displayNameRegExp, skipVirtualDestinations) {
-
-    /** @private {!Array<!print_preview.Destination.Origin>} */
-    this.origins_ = origins;
-
-    /** @private {RegExp} */
-    this.idRegExp_ = idRegExp;
-
-    /** @private {RegExp} */
-    this.displayNameRegExp_ = displayNameRegExp;
-
-    /** @private {boolean} */
-    this.skipVirtualDestinations_ = skipVirtualDestinations;
-  };
-
-  DestinationMatch.prototype = {
-
-    /**
-     * @param {!print_preview.Destination.Origin} origin Origin to match.
-     * @return {boolean} Whether the origin is one of the {@code origins_}.
-     */
-    matchOrigin: function(origin) {
-      return arrayContains(this.origins_, origin);
-    },
-
-    /**
-     * @param {string} id Id of the destination.
-     * @param {string} origin Origin of the destination.
-     * @return {boolean} Whether destination is the same as initial.
-     */
-    matchIdAndOrigin: function(id, origin) {
-      return this.matchOrigin(origin) &&
-             this.idRegExp_ &&
-             this.idRegExp_.test(id);
-    },
-
-    /**
-     * @param {!print_preview.Destination} destination Destination to match.
-     * @return {boolean} Whether {@code destination} matches the last user
-     *     selected one.
-     */
-    match: function(destination) {
-      if (!this.matchOrigin(destination.origin)) {
-        return false;
-      }
-      if (this.idRegExp_ && !this.idRegExp_.test(destination.id)) {
-        return false;
-      }
-      if (this.displayNameRegExp_ &&
-          !this.displayNameRegExp_.test(destination.displayName)) {
-        return false;
-      }
-      if (this.skipVirtualDestinations_ &&
-          this.isVirtualDestination_(destination)) {
-        return false;
-      }
-      return true;
-    },
-
-    /**
-     * @param {!print_preview.Destination} destination Destination to check.
-     * @return {boolean} Whether {@code destination} is virtual, in terms of
-     *     destination selection.
-     * @private
-     */
-    isVirtualDestination_: function(destination) {
-      if (destination.origin == print_preview.Destination.Origin.LOCAL) {
-        return arrayContains(
-            [print_preview.Destination.GooglePromotedId.SAVE_AS_PDF],
-            destination.id);
-      }
-      return arrayContains(
-          [print_preview.Destination.GooglePromotedId.DOCS],
-          destination.id);
-    }
-  };
-
-  /**
-   * A data store that stores destinations and dispatches events when the data
-   * store changes.
    * @param {!print_preview.NativeLayer} nativeLayer Used to fetch local print
    *     destinations.
    * @param {!print_preview.UserInfo} userInfo User information repository.
    * @param {!print_preview.AppState} appState Application state.
    * @constructor
    * @extends {cr.EventTarget}
    */
   function DestinationStore(nativeLayer, userInfo, appState) {
     cr.EventTarget.call(this);
 
@@ skipping 79 matching lines @@
     /**
      * Used to fetch cloud-based print destinations.
      * @type {cloudprint.CloudPrintInterface}
      * @private
      */
     this.cloudPrintInterface_ = null;
 
     /**
      * Maps user account to the list of origins for which destinations are
      * already loaded.
-     * @type {!Object<Array<print_preview.Destination.Origin>>}
+     * @type {!Object<Array<print_preview.DestinationOrigin>>}
      * @private
      */
     this.loadedCloudOrigins_ = {};
 
     /**
      * ID of a timeout after the initial destination ID is set. If no inserted
      * destination matches the initial destination ID after the specified
      * timeout, the first destination in the store will be automatically
      * selected.
      * @type {?number}
@@ skipping 65 matching lines @@
     /**
      * MDNS service name of destination that we are waiting to register.
      * @type {?string}
      * @private
      */
     this.waitForRegisterDestination_ = null;
 
     /**
      * Local destinations are CROS destinations on ChromeOS because they require
      * extra setup.
-     * @type {!print_preview.Destination.Origin}
+     * @type {!print_preview.DestinationOrigin}
      * @private
      */
     this.platformOrigin_ = cr.isChromeOS ?
-        print_preview.Destination.Origin.CROS :
-        print_preview.Destination.Origin.LOCAL;
+        print_preview.DestinationOrigin.CROS :
+        print_preview.DestinationOrigin.LOCAL;
 
     this.addEventListeners_();
     this.reset_();
-  };
+  }
 
   /**
    * Event types dispatched by the data store.
    * @enum {string}
    */
   DestinationStore.EventType = {
     DESTINATION_SEARCH_DONE:
         'print_preview.DestinationStore.DESTINATION_SEARCH_DONE',
     DESTINATION_SEARCH_STARTED:
         'print_preview.DestinationStore.DESTINATION_SEARCH_STARTED',
     DESTINATION_SELECT: 'print_preview.DestinationStore.DESTINATION_SELECT',
     DESTINATIONS_INSERTED:
         'print_preview.DestinationStore.DESTINATIONS_INSERTED',
     PROVISIONAL_DESTINATION_RESOLVED:
         'print_preview.DestinationStore.PROVISIONAL_DESTINATION_RESOLVED',
     CACHED_SELECTED_DESTINATION_INFO_READY:
         'print_preview.DestinationStore.CACHED_SELECTED_DESTINATION_INFO_READY',
     SELECTED_DESTINATION_CAPABILITIES_READY:
-        'print_preview.DestinationStore.SELECTED_DESTINATION_CAPABILITIES_READY',
+        'print_preview.DestinationStore' +
+        '.SELECTED_DESTINATION_CAPABILITIES_READY',
   };
 
   /**
    * Delay in milliseconds before the destination store ignores the initial
    * destination ID and just selects any printer (since the initial destination
    * was not found).
    * @private {number}
    * @const
    */
   DestinationStore.AUTO_SELECT_TIMEOUT_ = 15000;
@@ skipping 182 matching lines @@
     'PRC_5': 'prc5 Envelope',
     'PRC_6': 'prc6 Envelope',
     'PRC_7': 'prc7 Envelope',
     'PRC_8': 'prc8 Envelope',
     'ROC_16K': 'ROC 16K',
     'ROC_8K': 'ROC 8k',
   };
 
   /**
    * Localizes printer capabilities.
-   * @param {!Object} capabilities Printer capabilities to localize.
-   * @return {!Object} Localized capabilities.
+   * @param {!print_preview.Cdd} capabilities Printer capabilities to localize.
+   * @return {!print_preview.Cdd} Localized capabilities.
    * @private
    */
   DestinationStore.localizeCapabilities_ = function(capabilities) {
     if (!capabilities.printer)
       return capabilities;
 
     var mediaSize = capabilities.printer.media_size;
     if (!mediaSize)
       return capabilities;
 
-    for (var i = 0, media; media = mediaSize.option[i]; i++) {
+    for (var i = 0, media; (media = mediaSize.option[i]); i++) {
       // No need to patch capabilities with localized names provided.
       if (!media.custom_display_name_localized) {
         media.custom_display_name =
             media.custom_display_name ||
             DestinationStore.MEDIA_DISPLAY_NAMES_[media.name] ||
             media.name;
       }
     }
     return capabilities;
   };
 
   /**
    * Compare two media sizes by their names.
    * @param {!Object} a Media to compare.
    * @param {!Object} b Media to compare.
    * @return {number} 1 if a > b, -1 if a < b, or 0 if a == b.
    * @private
    */
   DestinationStore.compareMediaNames_ = function(a, b) {
     var nameA = a.custom_display_name_localized || a.custom_display_name;
     var nameB = b.custom_display_name_localized || b.custom_display_name;
     return nameA == nameB ? 0 : (nameA > nameB ? 1 : -1);
   };
 
   /**
    * Sort printer media sizes.
-   * @param {!Object} capabilities Printer capabilities to localize.
-   * @return {!Object} Localized capabilities.
+   * @param {!print_preview.Cdd} capabilities Printer capabilities to localize.
+   * @return {!print_preview.Cdd} Localized capabilities.
    * @private
    */
   DestinationStore.sortMediaSizes_ = function(capabilities) {
     if (!capabilities.printer)
       return capabilities;
 
     var mediaSize = capabilities.printer.media_size;
     if (!mediaSize)
       return capabilities;
 
     // For the standard sizes, separate into categories, as seen in the Cloud
     // Print CDD guide:
     // - North American
     // - Chinese
     // - ISO
     // - Japanese
     // - Other metric
     // Otherwise, assume they are custom sizes.
     var categoryStandardNA = [];
     var categoryStandardCN = [];
     var categoryStandardISO = [];
     var categoryStandardJP = [];
     var categoryStandardMisc = [];
     var categoryCustom = [];
-    for (var i = 0, media; media = mediaSize.option[i]; i++) {
+    for (var i = 0, media; (media = mediaSize.option[i]); i++) {
       var name = media.name || 'CUSTOM';
       var category;
       if (name.startsWith('NA_')) {
         category = categoryStandardNA;
       } else if (name.startsWith('PRC_') || name.startsWith('ROC_') ||
                  name == 'OM_DAI_PA_KAI' || name == 'OM_JUURO_KU_KAI' ||
                  name == 'OM_PA_KAI') {
         category = categoryStandardCN;
       } else if (name.startsWith('ISO_')) {
         category = categoryStandardISO;
@@ skipping 65 matching lines @@
     },
 
     /**
      * @return {boolean} Whether a search for cloud destinations is in progress.
      */
     get isCloudDestinationSearchInProgress() {
       return !!this.cloudPrintInterface_ &&
              this.cloudPrintInterface_.isCloudDestinationSearchInProgress;
     },
 
-    /*
+    /**
      * Initializes the destination store. Sets the initially selected
      * destination. If any inserted destinations match this ID, that destination
      * will be automatically selected. This method must be called after the
      * print_preview.AppState has been initialized.
      * @param {boolean} isInAppKioskMode Whether the print preview is in App
      *     Kiosk mode.
      * @param {?string} systemDefaultDestinationId ID of the system default
      *     destination.
      * @param {?string} serializedDefaultDestinationSelectionRulesStr Serialized
      *     default destination selection rules.
@@ skipping 61 matching lines @@
                                     name,
                                     capabilities,
                                     extensionId,
                                     extensionName);
           }
         }
       }
       if (foundDestination) return;
 
       // Try the system default
-      id = this.systemDefaultDestinationId_;
+      id = this.systemDefaultDestinationId_ || '';
       origin = id == print_preview.Destination.GooglePromotedId.SAVE_AS_PDF ?
-          print_preview.Destination.Origin.LOCAL :
+          print_preview.DestinationOrigin.LOCAL :
           this.platformOrigin_;
       account = '';
       var candidate =
           this.destinationMap_[this.getDestinationKey_(origin, id, account)];
       if (candidate != null) {
         this.selectDestination(candidate);
         return;
       }
 
       if (this.fetchPreselectedDestination_(
               origin,
               id,
               account,
               name,
               capabilities,
               extensionId,
               extensionName)) {
         return;
       }
 
       this.selectPdfDestination_();
     },
 
     /**
      * Attempts to fetch capabilities of the destination identified by the
      * provided origin, id and account.
-     * @param {!print_preview.Destination.Origin} origin Destination origin.
+     * @param {string | print_preview.DestinationOrigin} origin Destination
+     *     origin.
      * @param {string} id Destination id.
      * @param {string} account User account destination is registered for.
      * @param {string} name Destination display name.
      * @param {?print_preview.Cdd} capabilities Destination capabilities.
      * @param {string} extensionId Extension ID associated with this
      *     destination.
      * @param {string} extensionName Extension name associated with this
      *     destination.
      * @private
      */
     fetchPreselectedDestination_: function(
         origin, id, account, name, capabilities, extensionId, extensionName) {
       this.autoSelectMatchingDestination_ =
           this.createExactDestinationMatch_(origin, id);
 
-      if (origin == print_preview.Destination.Origin.LOCAL ||
-          origin == print_preview.Destination.Origin.CROS) {
+      if (origin == print_preview.DestinationOrigin.LOCAL ||
+          origin == print_preview.DestinationOrigin.CROS) {
         this.nativeLayer_.startGetLocalDestinationCapabilities(id);
         return true;
       }
 
       if (this.cloudPrintInterface_ &&
-          (origin == print_preview.Destination.Origin.COOKIES ||
-           origin == print_preview.Destination.Origin.DEVICE)) {
-        this.cloudPrintInterface_.printer(id, origin, account);
+          (origin == print_preview.DestinationOrigin.COOKIES ||
+           origin == print_preview.DestinationOrigin.DEVICE)) {
+        this.cloudPrintInterface_.printer(
+            id,
+            /** @type {print_preview.DestinationOrigin} */(origin),
+            account);
         return true;
       }
 
-      if (origin == print_preview.Destination.Origin.PRIVET) {
+      if (origin == print_preview.DestinationOrigin.PRIVET) {
         // TODO(noamsml): Resolve a specific printer instead of listing all
         // privet printers in this case.
         this.nativeLayer_.startGetPrivetDestinations();
 
         // Create a fake selectedDestination_ that is not actually in the
         // destination store. When the real destination is created, this
         // destination will be overwritten.
         this.selectedDestination_ = new print_preview.Destination(
             id,
-            print_preview.Destination.Type.LOCAL,
-            print_preview.Destination.Origin.PRIVET,
+            print_preview.DestinationType.LOCAL,
+            print_preview.DestinationOrigin.PRIVET,
             name,
             false /*isRecent*/,
-            print_preview.Destination.ConnectionStatus.ONLINE);
+            print_preview.DestinationConnectionStatus.ONLINE);
         this.selectedDestination_.capabilities = capabilities;
 
         cr.dispatchSimpleEvent(
           this,
           DestinationStore.EventType.CACHED_SELECTED_DESTINATION_INFO_READY);
         return true;
       }
 
-      if (origin == print_preview.Destination.Origin.EXTENSION) {
+      if (origin == print_preview.DestinationOrigin.EXTENSION) {
         // TODO(tbarzic): Add support for requesting a single extension's
         // printer list.
         this.startLoadExtensionDestinations();
 
         this.selectedDestination_ =
             print_preview.ExtensionDestinationParser.parse({
               extensionId: extensionId,
               extensionName: extensionName,
               id: id,
               name: name
@@ skipping 15 matching lines @@
 
     /**
      * Attempts to find a destination matching the provided rules.
      * @param {!print_preview.DestinationMatch} destinationMatch Rules to match.
      * @private
      */
     fetchMatchingDestination_: function(destinationMatch) {
       this.autoSelectMatchingDestination_ = destinationMatch;
 
       if (destinationMatch.matchOrigin(
-            print_preview.Destination.Origin.LOCAL) ||
+            print_preview.DestinationOrigin.LOCAL) ||
           destinationMatch.matchOrigin(
-            print_preview.Destination.Origin.CROS)) {
+            print_preview.DestinationOrigin.CROS)) {
         this.startLoadLocalDestinations();
       }
       if (destinationMatch.matchOrigin(
-            print_preview.Destination.Origin.PRIVET)) {
+            print_preview.DestinationOrigin.PRIVET)) {
         this.startLoadPrivetDestinations();
       }
       if (destinationMatch.matchOrigin(
-            print_preview.Destination.Origin.EXTENSION)) {
+            print_preview.DestinationOrigin.EXTENSION)) {
         this.startLoadExtensionDestinations();
       }
       if (destinationMatch.matchOrigin(
-            print_preview.Destination.Origin.COOKIES) ||
+            print_preview.DestinationOrigin.COOKIES) ||
           destinationMatch.matchOrigin(
-            print_preview.Destination.Origin.DEVICE) ||
+            print_preview.DestinationOrigin.DEVICE) ||
           destinationMatch.matchOrigin(
-            print_preview.Destination.Origin.PROFILE)) {
+            print_preview.DestinationOrigin.PROFILE)) {
         this.startLoadCloudDestinations();
       }
     },
 
     /**
      * @param {?string} serializedDefaultDestinationSelectionRulesStr Serialized
      *     default destination selection rules.
-     * @return {!print_preview.DestinationMatch} Creates rules matching
+     * @return {?print_preview.DestinationMatch} Creates rules matching
      *     previously selected destination.
      * @private
      */
     convertToDestinationMatch_: function(
         serializedDefaultDestinationSelectionRulesStr) {
       var matchRules = null;
       try {
         if (serializedDefaultDestinationSelectionRulesStr) {
           matchRules =
               JSON.parse(serializedDefaultDestinationSelectionRulesStr);
         }
       } catch(e) {
         console.error(
             'Failed to parse defaultDestinationSelectionRules: ' + e);
       }
       if (!matchRules)
-        return;
+        return null;
 
       var isLocal = !matchRules.kind || matchRules.kind == 'local';
       var isCloud = !matchRules.kind || matchRules.kind == 'cloud';
       if (!isLocal && !isCloud) {
         console.error('Unsupported type: "' + matchRules.kind + '"');
         return null;
       }
 
       var origins = [];
       if (isLocal) {
-        origins.push(print_preview.Destination.Origin.LOCAL);
-        origins.push(print_preview.Destination.Origin.PRIVET);
-        origins.push(print_preview.Destination.Origin.EXTENSION);
-        origins.push(print_preview.Destination.Origin.CROS);
+        origins.push(print_preview.DestinationOrigin.LOCAL);
+        origins.push(print_preview.DestinationOrigin.PRIVET);
+        origins.push(print_preview.DestinationOrigin.EXTENSION);
+        origins.push(print_preview.DestinationOrigin.CROS);
       }
       if (isCloud) {
-        origins.push(print_preview.Destination.Origin.COOKIES);
-        origins.push(print_preview.Destination.Origin.DEVICE);
-        origins.push(print_preview.Destination.Origin.PROFILE);
+        origins.push(print_preview.DestinationOrigin.COOKIES);
+        origins.push(print_preview.DestinationOrigin.DEVICE);
+        origins.push(print_preview.DestinationOrigin.PROFILE);
       }
 
       var idRegExp = null;
       try {
         if (matchRules.idPattern) {
           idRegExp = new RegExp(matchRules.idPattern || '.*');
         }
       } catch (e) {
         console.error('Failed to parse regexp for "id": ' + e);
       }
 
       var displayNameRegExp = null;
       try {
         if (matchRules.namePattern) {
           displayNameRegExp = new RegExp(matchRules.namePattern || '.*');
         }
       } catch (e) {
         console.error('Failed to parse regexp for "name": ' + e);
       }
 
-      return new DestinationMatch(
+      return new print_preview.DestinationMatch(
           origins,
           idRegExp,
           displayNameRegExp,
           true /*skipVirtualDestinations*/);
     },
 
     /**
      * @return {print_preview.DestinationMatch} Creates rules matching
      *     previously selected destination.
      * @private
      */
     convertPreselectedToDestinationMatch_: function() {
       if (this.appState_.isSelectedDestinationValid()) {
         return this.createExactDestinationMatch_(
             this.appState_.selectedDestination.origin,
             this.appState_.selectedDestination.id);
       }
       if (this.systemDefaultDestinationId_) {
         return this.createExactDestinationMatch_(
             this.platformOrigin_,
             this.systemDefaultDestinationId_);
       }
       return null;
     },
 
     /**
-     * @param {!print_preview.Destination.Origin} origin Destination origin.
+     * @param {string | print_preview.DestinationOrigin} origin Destination
+     *     origin.
      * @param {string} id Destination id.
      * @return {!print_preview.DestinationMatch} Creates rules matching
      *     provided destination.
      * @private
      */
     createExactDestinationMatch_: function(origin, id) {
-      return new DestinationMatch(
+      return new print_preview.DestinationMatch(
           [origin],
           new RegExp('^' + id.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '$'),
           null /*displayNameRegExp*/,
           false /*skipVirtualDestinations*/);
     },
 
     /**
      * Sets the destination store's Google Cloud Print interface.
      * @param {!cloudprint.CloudPrintInterface} cloudPrintInterface Interface
      *     to set.
@@ skipping 100 matching lines @@
       }
     },
 
     /**
      * Attempt to resolve the capabilities for a Chrome OS printer.
      * @param {!print_preview.Destination} destination The destination which
      *     requires resolution.
      * @return {!Promise<!print_preview.PrinterSetupResponse>}
      */
     resolveCrosDestination: function(destination) {
-      assert(destination.origin == print_preview.Destination.Origin.CROS);
+      assert(destination.origin == print_preview.DestinationOrigin.CROS);
       return this.nativeLayer_.setupPrinter(destination.id);
     },
 
     /**
      * Attempts to resolve a provisional destination.
-     * @param {!print_preview.Destination} destinaion Provisional destination
+     * @param {!print_preview.Destination} destination Provisional destination
      *     that should be resolved.
      */
     resolveProvisionalDestination: function(destination) {
       assert(
           destination.provisionalType ==
-              print_preview.Destination.ProvisionalType.NEEDS_USB_PERMISSION,
+              print_preview.DestinationProvisionalType.NEEDS_USB_PERMISSION,
           'Provisional type cannot be resolved.');
       this.nativeLayer_.grantExtensionPrinterAccess(destination.id);
     },
 
     /**
      * Selects 'Save to PDF' destination (since it always exists).
      * @private
      */
     selectPdfDestination_: function() {
       var saveToPdfKey = this.getDestinationKey_(
-          print_preview.Destination.Origin.LOCAL,
+          print_preview.DestinationOrigin.LOCAL,
           print_preview.Destination.GooglePromotedId.SAVE_AS_PDF,
           '');
       this.selectDestination(
           this.destinationMap_[saveToPdfKey] || this.destinations_[0] || null);
     },
 
     /**
      * Attempts to select system default destination with a fallback to
      * 'Save to PDF' destination.
      * @private
      */
     selectDefaultDestination_: function() {
       if (this.systemDefaultDestinationId_) {
         if (this.autoSelectMatchingDestination_ &&
             !this.autoSelectMatchingDestination_.matchIdAndOrigin(
                 this.systemDefaultDestinationId_,
-                this.plaformOrigin_)) {
+                this.platformOrigin_)) {
           if (this.fetchPreselectedDestination_(
                 this.platformOrigin_,
                 this.systemDefaultDestinationId_,
                 '' /*account*/,
                 '' /*name*/,
                 null /*capabilities*/,
                 '' /*extensionId*/,
                 '' /*extensionName*/)) {
             return;
           }
@@ skipping 40 matching lines @@
       this.nativeLayer_.startGetExtensionDestinations();
       cr.dispatchSimpleEvent(
           this, DestinationStore.EventType.DESTINATION_SEARCH_STARTED);
       this.extensionSearchTimeout_ = setTimeout(
           this.endExtensionPrinterSearch_.bind(this),
           DestinationStore.EXTENSION_SEARCH_DURATION_);
     },
 
     /**
      * Initiates loading of cloud destinations.
-     * @param {print_preview.Destination.Origin=} opt_origin Search destinations
+     * @param {print_preview.DestinationOrigin=} opt_origin Search destinations
      *     for the specified origin only.
      */
     startLoadCloudDestinations: function(opt_origin) {
       if (this.cloudPrintInterface_ != null) {
         var origins = this.loadedCloudOrigins_[this.userInfo_.activeUser] || [];
         if (origins.length == 0 ||
             (opt_origin && origins.indexOf(opt_origin) < 0)) {
           this.cloudPrintInterface_.search(
-              this.userInfo_.activeUser, opt_origin);
+              this.userInfo_.activeUser || '', opt_origin);
           cr.dispatchSimpleEvent(
               this, DestinationStore.EventType.DESTINATION_SEARCH_STARTED);
         }
       }
     },
 
     /** Requests load of COOKIE based cloud destinations. */
     reloadUserCookieBasedDestinations: function() {
       var origins = this.loadedCloudOrigins_[this.userInfo_.activeUser] || [];
-      if (origins.indexOf(print_preview.Destination.Origin.COOKIES) >= 0) {
+      if (origins.indexOf(print_preview.DestinationOrigin.COOKIES) >= 0) {
         cr.dispatchSimpleEvent(
             this, DestinationStore.EventType.DESTINATION_SEARCH_DONE);
       } else {
         this.startLoadCloudDestinations(
-            print_preview.Destination.Origin.COOKIES);
+            print_preview.DestinationOrigin.COOKIES);
       }
     },
 
     /** Initiates loading of all known destination types. */
     startLoadAllDestinations: function() {
       this.startLoadCloudDestinations();
       this.startLoadLocalDestinations();
       this.startLoadPrivetDestinations();
       this.startLoadExtensionDestinations();
     },
@@ skipping 10 matching lines @@
      * Event handler for {@code
      * print_preview.NativeLayer.EventType.PROVISIONAL_DESTINATION_RESOLVED}.
      * Currently assumes the provisional destination is an extension
      * destination.
      * Called when a provisional destination resolvement attempt finishes.
      * The provisional destination is removed from the store and replaced with
      * a destination created from the resolved destination properties, if any
      * are reported.
      * Emits {@code DestinationStore.EventType.PROVISIONAL_DESTINATION_RESOLVED}
      * event.
-     * @param {!Event} The event containing the provisional destination ID and
-     *     resolved destination description. If the destination was not
+     * @param {!Event} evt The event containing the provisional destination ID
+     *     and resolved destination description. If the destination was not
      *     successfully resolved, the description will not be set.
      * @private
      */
     handleProvisionalDestinationResolved_: function(evt) {
       var provisionalDestinationIndex = -1;
       var provisionalDestination = null;
       for (var i = 0; i < this.destinations_.length; ++i) {
         if (evt.provisionalId == this.destinations_[i].id) {
           provisionalDestinationIndex = i;
           provisionalDestination = this.destinations_[i];
@@ skipping 77 matching lines @@
 
     /**
      * Updates an existing print destination with capabilities and display name
      * information. If the destination doesn't already exist, it will be added.
      * @param {!print_preview.Destination} destination Destination to update.
      * @private
      */
     updateDestination_: function(destination) {
       assert(destination.constructor !== Array, 'Single printer expected');
       destination.capabilities_ = DestinationStore.localizeCapabilities_(
-          destination.capabilities_);
+          assert(destination.capabilities_));
       destination.capabilities_ = DestinationStore.sortMediaSizes_(
           destination.capabilities_);
       var existingDestination = this.destinationMap_[this.getKey_(destination)];
       if (existingDestination != null) {
         existingDestination.capabilities = destination.capabilities;
       } else {
         this.insertDestination_(destination);
       }
 
       if (this.selectedDestination_ &&
@@ skipping 24 matching lines @@
      */
     endExtensionPrinterSearch_: function() {
       this.isExtensionDestinationSearchInProgress_ = false;
       this.hasLoadedAllExtensionDestinations_ = true;
       cr.dispatchSimpleEvent(
           this, DestinationStore.EventType.DESTINATION_SEARCH_DONE);
       // Clear initially selected (cached) extension destination if it hasn't
       // been found among reported extension destinations.
       if (this.autoSelectMatchingDestination_ &&
           this.autoSelectMatchingDestination_.matchOrigin(
-              print_preview.Destination.Origin.EXTENSION) &&
+              print_preview.DestinationOrigin.EXTENSION) &&
           this.selectedDestination_ &&
           this.selectedDestination_.isExtension) {
         this.selectDefaultDestination_();
       }
     },
 
     /**
      * Inserts a destination into the store without dispatching any events.
      * @return {boolean} Whether the inserted destination was not already in the
      *     store.
      * @private
      */
     insertIntoStore_: function(destination) {
       var key = this.getKey_(destination);
       var existingDestination = this.destinationMap_[key];
       if (existingDestination == null) {
         destination.isRecent |= this.appState_.recentDestinations.some(
             function(recent) {
               return (destination.id == recent.id &&
                       destination.origin == recent.origin);
             }, this);
         this.destinations_.push(destination);
         this.destinationMap_[key] = destination;
         return true;
       } else if (existingDestination.connectionStatus ==
-                     print_preview.Destination.ConnectionStatus.UNKNOWN &&
+                     print_preview.DestinationConnectionStatus.UNKNOWN &&
                  destination.connectionStatus !=
-                     print_preview.Destination.ConnectionStatus.UNKNOWN) {
+                     print_preview.DestinationConnectionStatus.UNKNOWN) {
         existingDestination.connectionStatus = destination.connectionStatus;
         return true;
       } else {
         return false;
       }
     },
 
     /**
      * Binds handlers to events.
      * @private
@@ skipping 32 matching lines @@
           print_preview.NativeLayer.EventType.EXTENSION_CAPABILITIES_SET,
           this.onExtensionCapabilitiesSet_.bind(this));
       this.tracker_.add(
           this.nativeLayer_,
           print_preview.NativeLayer.EventType.PROVISIONAL_DESTINATION_RESOLVED,
           this.handleProvisionalDestinationResolved_.bind(this));
     },
 
     /**
      * Creates a local PDF print destination.
-     * @return {!print_preview.Destination} Created print destination.
      * @private
      */
     createLocalPdfPrintDestination_: function() {
       // TODO(alekseys): Create PDF printer in the native code and send its
       // capabilities back with other local printers.
       if (this.pdfPrinterEnabled_) {
         this.insertDestination_(new print_preview.Destination(
             print_preview.Destination.GooglePromotedId.SAVE_AS_PDF,
-            print_preview.Destination.Type.LOCAL,
-            print_preview.Destination.Origin.LOCAL,
+            print_preview.DestinationType.LOCAL,
+            print_preview.DestinationOrigin.LOCAL,
             loadTimeData.getString('printToPDF'),
             false /*isRecent*/,
-            print_preview.Destination.ConnectionStatus.ONLINE));
+            print_preview.DestinationConnectionStatus.ONLINE));
       }
     },
 
     /**
      * Resets the state of the destination store to its initial state.
      * @private
      */
     reset_: function() {
       this.destinations_ = [];
       this.destinationMap_ = {};
@@ skipping 34 matching lines @@
      * @private
      */
     onLocalDestinationCapabilitiesSet_: function(event) {
       var destinationId = event.settingsInfo['printerId'];
       var printerName = event.settingsInfo['printerName'];
       var printerDescription = event.settingsInfo['printerDescription'];
       // PDF is special since we don't need to query the device for
       // capabilities.
       var origin = destinationId ==
           print_preview.Destination.GooglePromotedId.SAVE_AS_PDF ?
-          print_preview.Destination.Origin.LOCAL : this.platformOrigin_;
+          print_preview.DestinationOrigin.LOCAL : this.platformOrigin_;
       var key = this.getDestinationKey_(
           origin,
           destinationId,
           '');
       var destination = this.destinationMap_[key];
       var capabilities = DestinationStore.localizeCapabilities_(
           event.settingsInfo.capabilities);
       // Special case for PDF printer (until local printers capabilities are
       // reported in CDD format too).
       if (destinationId ==
@@ skipping 103 matching lines @@
     onCloudPrintProcessInviteDone_: function(event) {
       if (event.accept && event.printer) {
         // Hint the destination list to promote this new destination.
         event.printer.isRecent = true;
         this.insertDestination_(event.printer);
       }
     },
 
     /**
      * Called when a Privet printer is added to the local network.
-     * @param {Object} event Contains information about the added printer.
+     * @param {{printer: {serviceName: string,
+     *                    name: string,
+     *                    hasLocalPrinting: boolean,
+     *                    isUnregistered: boolean,
+     *                    cloudID: string}}} event Contains information about
+     *      the added printer.
      * @private
      */
     onPrivetPrinterAdded_: function(event) {
       if (event.printer.serviceName == this.waitForRegisterDestination_ &&
           !event.printer.isUnregistered) {
         this.waitForRegisterDestination_ = null;
         this.onDestinationsReload_();
       } else {
         this.insertDestinations_(
             print_preview.PrivetDestinationParser.parse(event.printer));
@@ skipping 34 matching lines @@
       }
     },
 
     /**
      * Called when capabilities for an extension managed printer are set.
      * @param {Object} event Contains the printer's capabilities and ID.
      * @private
      */
     onExtensionCapabilitiesSet_: function(event) {
       var destinationKey = this.getDestinationKey_(
-          print_preview.Destination.Origin.EXTENSION,
+          print_preview.DestinationOrigin.EXTENSION,
           event.printerId,
           '' /* account */);
       var destination = this.destinationMap_[destinationKey];
       if (!destination)
         return;
       destination.capabilities = event.capabilities;
       this.updateDestination_(destination);
     },
 
     /**
      * Called from native layer after the user was requested to sign in, and did
      * so successfully.
      * @private
      */
     onDestinationsReload_: function() {
       this.reset_();
       this.autoSelectMatchingDestination_ =
           this.convertPreselectedToDestinationMatch_();
       this.createLocalPdfPrintDestination_();
       this.startLoadAllDestinations();
     },
 
     // TODO(vitalybuka): Remove three next functions replacing Destination.id
     //    and Destination.origin by complex ID.
     /**
      * Returns key to be used with {@code destinationMap_}.
-     * @param {!print_preview.Destination.Origin} origin Destination origin.
+     * @param {print_preview.DestinationOrigin | string} origin Destination
+     *     origin.
      * @param {string} id Destination id.
      * @param {string} account User account destination is registered for.
      * @private
      */
     getDestinationKey_: function(origin, id, account) {
       return origin + '/' + id + '/' + account;
     },
 
     /**
      * Returns key to be used with {@code destinationMap_}.
      * @param {!print_preview.Destination} destination Destination.
      * @private
      */
     getKey_: function(destination) {
       return this.getDestinationKey_(
           destination.origin, destination.id, destination.account);
     }
   };
 
   // Export
   return {
     DestinationStore: DestinationStore
   };
 });