Rename AuthType to Origin of destination.

chrome/browser/resources/print_preview/data/app_state.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';
 
   /**
    * Object used to get and persist the print preview application state.
    * @constructor
    */
   function AppState() {
     /**
      * ID of the selected destination.
      * @type {?string}
      * @private
      */
     this.selectedDestinationId_ = null;
 
     /**
-     * Whether the selected destination is a local destination.
-     * @type {?boolean}
+     * Origin of the selected destination.
+     * @type {?string}
      * @private
      */
-    this.isSelectedDestinationLocal_ = null;
+    this.selectedDestinationOrigin_ = null;
 
     /**
      * Whether the GCP promotion has been dismissed.
      * @type {boolean}
      * @private
      */
     this.isGcpPromoDismissed_ = true;
 
     /**
      * Margins type.
@@ skipping 62 matching lines @@
   AppState.VERSION_ = 2;
 
   /**
    * Enumeration of field names for serialized app state.
    * @enum {string}
    * @private
    */
   AppState.Field_ = {
     VERSION: 'version',
     SELECTED_DESTINATION_ID: 'selectedDestinationId',
-    IS_SELECTED_DESTINATION_LOCAL: 'isSelectedDestinationLocal',
+    SELECTED_DESTINATION_ORIGIN: 'selectedDestinationOrigin',
+    IS_SELECTED_DESTINATION_LOCAL: 'isSelectedDestinationLocal',  // Deprecated
     IS_GCP_PROMO_DISMISSED: 'isGcpPromoDismissed',
     MARGINS_TYPE: 'marginsType',
     CUSTOM_MARGINS: 'customMargins',
     IS_COLOR_ENABLED: 'isColorEnabled',
     IS_DUPLEX_ENABLED: 'isDuplexEnabled',
     IS_HEADER_FOOTER_ENABLED: 'isHeaderFooterEnabled',
     IS_LANDSCAPE_ENABLED: 'isLandscapeEnabled',
     IS_COLLATE_ENABLED: 'isCollateEnabled',
     IS_CSS_BACKGROUND_ENABLED: 'isCssBackgroundEnabled'
   };
 
   /**
    * Name of C++ layer function to persist app state.
    * @type {string}
    * @const
    * @private
    */
   AppState.NATIVE_FUNCTION_NAME_ = 'saveAppState';
 
   AppState.prototype = {
     /** @return {?string} ID of the selected destination. */
     get selectedDestinationId() {
       return this.selectedDestinationId_;
     },
 
-    /** @return {?boolean} Whether the selected destination is local. */
-    get isSelectedDestinationLocal() {
-      return this.isSelectedDestinationLocal_;
+    /** @return {?string} Origin of the selected destination. */
+    get selectedDestinationOrigin() {
+      return this.selectedDestinationOrigin_;
     },
 
     /** @return {boolean} Whether the GCP promotion has been dismissed. */
     get isGcpPromoDismissed() {
       return this.isGcpPromoDismissed_;
     },
 
     /** @return {print_preview.ticket_items.MarginsType.Value} Margins type. */
     get marginsType() {
       return this.marginsType_;
@@ skipping 41 matching lines @@
      *     of the app state.
      */
     init: function(serializedAppStateStr) {
       if (!serializedAppStateStr) {
         // Set some state defaults.
         this.isGcpPromoDismissed_ = false;
         return;
       }
 
       var state = JSON.parse(serializedAppStateStr);
-      if (state[AppState.Field_.VERSION] == 2) {
+      if (state[AppState.Field_.VERSION] == AppState.VERSION_) {
         this.selectedDestinationId_ =
             state[AppState.Field_.SELECTED_DESTINATION_ID] || null;
         if (state.hasOwnProperty(
                 AppState.Field_.IS_SELECTED_DESTINATION_LOCAL)) {

[Toscano, 2013/04/18 22:45:40]

Let's use the version == 2 condition for this if statement.

[Vitaly Buka (NO REVIEWS), 2013/04/18 23:44:59]

Done.

-          this.isSelectedDestinationLocal_ =
-              state[AppState.Field_.IS_SELECTED_DESTINATION_LOCAL];
+          this.selectedDestinationOrigin_ =
+              state[AppState.Field_.IS_SELECTED_DESTINATION_LOCAL] ?
+              print_preview.Destination.Origin.LOCAL :
+              print_preview.Destination.Origin.COOKIES;
+        } else {
+          this.selectedDestinationOrigin_ =
+              state[AppState.Field_.SELECTED_DESTINATION_ORIGIN] || null;
         }
+
         this.isGcpPromoDismissed_ =
             state[AppState.Field_.IS_GCP_PROMO_DISMISSED] || false;
         if (state.hasOwnProperty(AppState.Field_.MARGINS_TYPE)) {
           this.marginsType_ = state[AppState.Field_.MARGINS_TYPE];
         }
         if (state[AppState.Field_.CUSTOM_MARGINS]) {
           this.customMargins_ = print_preview.Margins.parse(
               state[AppState.Field_.CUSTOM_MARGINS]);
         }
         if (state.hasOwnProperty(AppState.Field_.IS_COLOR_ENABLED)) {
@@ skipping 19 matching lines @@
         }
       }
     },
 
     /**
      * Persists the selected destination.
      * @param {!print_preview.Destination} dest Destination to persist.
      */
     persistSelectedDestination: function(dest) {
       this.selectedDestinationId_ = dest.id;
-      this.isSelectedDestinationLocal_ = dest.isLocal;
+      this.selectedDestinationOrigin_ = dest.origin;
       this.persist_();
     },
 
    /**
     * Persists whether the GCP promotion has been dismissed.
     * @param {boolean} isGcpPromoDismissed Whether the GCP promotion has been
     *     dismissed.
     */
    persistIsGcpPromoDismissed: function(isGcpPromoDismissed) {
      this.isGcpPromoDismissed_ = isGcpPromoDismissed;
@@ skipping 76 matching lines @@
 
     /**
      * Calls into the native layer to persist the application state.
      * @private
      */
     persist_: function() {
       var obj = {};
       obj[AppState.Field_.VERSION] = AppState.VERSION_;
       obj[AppState.Field_.SELECTED_DESTINATION_ID] =
           this.selectedDestinationId_;
-      obj[AppState.Field_.IS_SELECTED_DESTINATION_LOCAL] =
-          this.isSelectedDestinationLocal_;
+      obj[AppState.Field_.SELECTED_DESTINATION_ORIGIN] =
+          this.selectedDestinationOrigin_;
       obj[AppState.Field_.IS_GCP_PROMO_DISMISSED] = this.isGcpPromoDismissed_;
       obj[AppState.Field_.MARGINS_TYPE] = this.marginsType_;
       if (this.customMargins_) {
         obj[AppState.Field_.CUSTOM_MARGINS] = this.customMargins_.serialize();
       }
       obj[AppState.Field_.IS_COLOR_ENABLED] = this.isColorEnabled_;
       obj[AppState.Field_.IS_DUPLEX_ENABLED] = this.isDuplexEnabled_;
       obj[AppState.Field_.IS_HEADER_FOOTER_ENABLED] =
           this.isHeaderFooterEnabled_;
       obj[AppState.Field_.IS_LANDSCAPE_ENABLED] = this.isLandscapeEnabled_;
       obj[AppState.Field_.IS_COLLATE_ENABLED] = this.isCollateEnabled_;
       obj[AppState.Field_.IS_CSS_BACKGROUND_ENABLED] =
           this.isCssBackgroundEnabled_;
       chrome.send(AppState.NATIVE_FUNCTION_NAME_, [JSON.stringify(obj)]);
     }
   };
 
   return {
     AppState: AppState
   };
 });