Remember and restore the account last used destination is registered for.

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
@@ skipping 17 matching lines @@
     this.isInitialized_ = false;
   };
 
   /**
    * Enumeration of field names for serialized app state.
    * @enum {string}
    */
   AppState.Field = {
     VERSION: 'version',
     SELECTED_DESTINATION_ID: 'selectedDestinationId',
+    SELECTED_DESTINATION_ACCOUNT: 'selectedDestinationAccount',
     SELECTED_DESTINATION_ORIGIN: 'selectedDestinationOrigin',
     SELECTED_DESTINATION_CAPABILITIES: 'selectedDestinationCapabilities',
     SELECTED_DESTINATION_NAME: 'selectedDestinationName',
-    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'
   };
@@ skipping 14 matching lines @@
    * @private
    */
   AppState.NATIVE_FUNCTION_NAME_ = 'saveAppState';
 
   AppState.prototype = {
     /** @return {?string} ID of the selected destination. */
     get selectedDestinationId() {
       return this.state_[AppState.Field.SELECTED_DESTINATION_ID];
     },
 
+    /** @return {?string} Account the selected destination is registered for. */
+    get selectedDestinationAccount() {
+      return this.state_[AppState.Field.SELECTED_DESTINATION_ACCOUNT];
+    },
+
     /** @return {?string} Origin of the selected destination. */
     get selectedDestinationOrigin() {
       return this.state_[AppState.Field.SELECTED_DESTINATION_ORIGIN];
     },
 
     /** @return {?print_preview.Cdd} CDD of the selected destination. */
     get selectedDestinationCapabilities() {
-      return this.state_[AppState.Field.SELECTED_DESTINATION_CAPBILITIES];
+      return this.state_[AppState.Field.SELECTED_DESTINATION_CAPABILITIES];
     },
 
     /** @return {?string} Name of the selected destination. */
     get selectedDestinationName() {
       return this.state_[AppState.Field.SELECTED_DESTINATION_NAME];
     },
 
     /** @return {boolean} Whether the GCP promotion has been dismissed. */
     get isGcpPromoDismissed() {
       return this.state_[AppState.Field.IS_GCP_PROMO_DISMISSED];
@@ skipping 19 matching lines @@
       } else {
         return this.state_[field];
       }
     },
 
     /**
      * Initializes the app state from a serialized string returned by the native
      * layer.
      * @param {?string} serializedAppStateStr Serialized string representation
      *     of the app state.
+     * @param {?string} systemDefaultDestinationId ID of the system default
+     *     destination.
      */
-    init: function(serializedAppStateStr) {
+    init: function(serializedAppStateStr, systemDefaultDestinationId) {
       if (serializedAppStateStr) {
         var state = JSON.parse(serializedAppStateStr);
         if (state[AppState.Field.VERSION] == AppState.VERSION_) {
-          if (state.hasOwnProperty(
-              AppState.Field.IS_SELECTED_DESTINATION_LOCAL)) {
-            state[AppState.Field.SELECTED_DESTINATION_ORIGIN] =
-                state[AppState.Field.IS_SELECTED_DESTINATION_LOCAL] ?
-                print_preview.Destination.Origin.LOCAL :
-                print_preview.Destination.Origin.COOKIES;
-            delete state[AppState.Field.IS_SELECTED_DESTINATION_LOCAL];
-          }
           this.state_ = state;
         }
       } else {
         // Set some state defaults.
         this.state_[AppState.Field.IS_GCP_PROMO_DISMISSED] = false;
       }
+      // Default to system destination, if no destination was selected.
+      if (!this.state_[AppState.Field.SELECTED_DESTINATION_ID] ||
+          !this.state_[AppState.Field.SELECTED_DESTINATION_ORIGIN]) {
+        if (systemDefaultDestinationId) {
+          this.state_[AppState.Field.SELECTED_DESTINATION_ID] =

[Vitaly Buka (NO REVIEWS), 2014/04/11 02:32:57]

this could be separate CL

[Toscano, 2014/04/11 04:24:00]

agreed

[Aleksey Shlyapnikov, 2014/04/11 19:09:29]

Done.

[Aleksey Shlyapnikov, 2014/04/11 19:09:29]

Done.

+              systemDefaultDestinationId;
+          this.state_[AppState.Field.SELECTED_DESTINATION_ORIGIN] =
+              print_preview.Destination.Origin.LOCAL;
+        }
+      }
     },
 
     /**
      * Sets to initialized state. Now object will accept persist requests.
      */
     setInitialized: function() {
       this.isInitialized_ = true;
     },
 
     /**
@@ skipping 13 matching lines @@
     },
 
     /**
      * Persists the selected destination.
      * @param {!print_preview.Destination} dest Destination to persist.
      */
     persistSelectedDestination: function(dest) {
       if (!this.isInitialized_)
         return;
       this.state_[AppState.Field.SELECTED_DESTINATION_ID] = dest.id;
+      this.state_[AppState.Field.SELECTED_DESTINATION_ACCOUNT] = dest.account;
       this.state_[AppState.Field.SELECTED_DESTINATION_ORIGIN] = dest.origin;
-      this.state_[AppState.Field.SELECTED_DESTINATION_CAPBILITIES] =
+      this.state_[AppState.Field.SELECTED_DESTINATION_CAPABILITIES] =
           dest.capabilities;
       this.state_[AppState.Field.SELECTED_DESTINATION_NAME] = dest.displayName;
       this.persist_();
     },
 
     /**
      * Persists whether the GCP promotion has been dismissed.
      * @param {boolean} isGcpPromoDismissed Whether the GCP promotion has been
      *     dismissed.
      */
@@ skipping 11 matching lines @@
     persist_: function() {
       chrome.send(AppState.NATIVE_FUNCTION_NAME_,
                   [JSON.stringify(this.state_)]);
     }
   };
 
   return {
     AppState: AppState
   };
 });