In App Kiosk mode, Print Preview changes:

- do not show user sign in promo
- do not show cloud print dialog link
- do not send COOKIES-based cloud printer search requests
- do not add Save as PDF printer
Related changes:
- fix UI issues when no printer is selected
- fix destination list sizing when one of the sections is empty

BUG=370096

Review URL: https://codereview.chromium.org/387073002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282800 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/print_preview/cloud_print_interface.js

@@ -13,10 +13,13 @@ cr.define('cloudprint', function() {
    * @param {!print_preview.NativeLayer} nativeLayer Native layer used to get
    *     Auth2 tokens.
    * @param {!print_preview.UserInfo} userInfo User information repository.
+   * @param {boolean} isInAppKioskMode Whether the print preview is in App
+   *     Kiosk mode.
    * @constructor
    * @extends {cr.EventTarget}
    */
-  function CloudPrintInterface(baseUrl, nativeLayer, userInfo) {
+  function CloudPrintInterface(
+      baseUrl, nativeLayer, userInfo, isInAppKioskMode) {
     /**
      * The base URL of the Google Cloud Print API.
      * @type {string}
@@ -38,6 +41,14 @@ cr.define('cloudprint', function() {
      */
     this.userInfo_ = userInfo;
 
+    /**
+     * Whether Print Preview is in App Kiosk mode, basically, use only printers
+     * available for the device.
+     * @type {boolean}
+     * @private
+     */
+    this.isInAppKioskMode_ = isInAppKioskMode;
+
     /**
      * Currently logged in users (identified by email) mapped to the Google
      * session index.
@@ -179,6 +190,11 @@ cr.define('cloudprint', function() {
       var account = opt_account || '';
       var origins =
           opt_origin && [opt_origin] || CloudPrintInterface.CLOUD_ORIGINS_;
+      if (this.isInAppKioskMode_) {
+        origins = origins.filter(function(origin) {
+          return origin != print_preview.Destination.Origin.COOKIES;
+        });
+      }
       this.abortSearchRequests_(origins);
       this.search_(true, account, origins);
       this.search_(false, account, origins);

chrome/browser/resources/print_preview/data/destination_store.js

@@ -83,6 +83,14 @@ cr.define('print_preview', function() {
      */
     this.tracker_ = new EventTracker();
 
+    /**
+     * Whether PDF printer is enabled. It's disabled, for example, in App Kiosk
+     * mode.
+     * @type {boolean}
+     * @private
+     */
+    this.pdfPrinterEnabled_ = false;
+
     /**
      * Used to fetch cloud-based print destinations.
      * @type {print_preview.CloudPrintInterface}
@@ -246,6 +254,12 @@ cr.define('print_preview', function() {
       return this.selectedDestination_;
     },
 
+    /** @return {boolean} Whether destination selection is pending or not. */
+    get isAutoSelectDestinationInProgress() {
+      return this.selectedDestination_ == null &&
+          this.autoSelectTimeout_ != null;
+    },
+
     /**
      * @return {boolean} Whether a search for local destinations is in progress.
      */
@@ -267,13 +281,16 @@ cr.define('print_preview', function() {
      * 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.
-     * @private
+     * @param {boolean} isInAppKioskMode Whether the print preview is in App
+     *     Kiosk mode.
      */
-    init: function() {
+    init: function(isInAppKioskMode) {
+      this.pdfPrinterEnabled_ = !isInAppKioskMode;
       this.isInAutoSelectMode_ = true;
+      this.createLocalPdfPrintDestination_();
       if (!this.appState_.selectedDestinationId ||
           !this.appState_.selectedDestinationOrigin) {
-        this.onAutoSelectFailed_();
+        this.selectDefaultDestination_();
       } else {
         var key = this.getDestinationKey_(
             this.appState_.selectedDestinationOrigin,
@@ -319,9 +336,8 @@ cr.define('print_preview', function() {
           cr.dispatchSimpleEvent(
             this,
             DestinationStore.EventType.CACHED_SELECTED_DESTINATION_INFO_READY);
-
         } else {
-          this.onAutoSelectFailed_();
+          this.selectDefaultDestination_();
         }
       }
     },
@@ -367,8 +383,12 @@ cr.define('print_preview', function() {
     /** @param {!print_preview.Destination} Destination to select. */
     selectDestination: function(destination) {
       this.isInAutoSelectMode_ = false;
-      this.cancelAutoSelectTimeout_();
-      if (destination == this.selectedDestination_) {
+      // When auto select expires, DESTINATION_SELECT event has to be dispatched
+      // anyway (see isAutoSelectDestinationInProgress() logic).
+      if (this.autoSelectTimeout_) {
+        clearTimeout(this.autoSelectTimeout_);
+        this.autoSelectTimeout_ = null;
+      } else if (destination == this.selectedDestination_) {
         return;
       }
       if (destination == null) {
@@ -434,12 +454,12 @@ cr.define('print_preview', function() {
      * @private
      */
     selectDefaultDestination_: function() {
-      var destination = this.destinationMap_[this.getDestinationKey_(
+      var saveToPdfKey = this.getDestinationKey_(
           print_preview.Destination.Origin.LOCAL,
           print_preview.Destination.GooglePromotedId.SAVE_AS_PDF,
-          '')] || null;
-      assert(destination != null, 'Save to PDF printer not found');
-      this.selectDestination(destination);
+          '');
+      this.selectDestination(
+          this.destinationMap_[saveToPdfKey] || this.destinations_[0] || null);
     },
 
     /** Initiates loading of local print destinations. */
@@ -658,13 +678,17 @@ cr.define('print_preview', function() {
      * @private
      */
     createLocalPdfPrintDestination_: function() {
-      return new print_preview.Destination(
-          print_preview.Destination.GooglePromotedId.SAVE_AS_PDF,
-          print_preview.Destination.Type.LOCAL,
-          print_preview.Destination.Origin.LOCAL,
-          localStrings.getString('printToPDF'),
-          false /*isRecent*/,
-          print_preview.Destination.ConnectionStatus.ONLINE);
+      // 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,
+            localStrings.getString('printToPDF'),
+            false /*isRecent*/,
+            print_preview.Destination.ConnectionStatus.ONLINE));
+      }
     },
 
     /**
@@ -677,32 +701,11 @@ cr.define('print_preview', function() {
       this.selectDestination(null);
       this.loadedCloudOrigins_ = {};
       this.hasLoadedAllLocalDestinations_ = false;
-      // TODO(alekseys): Create PDF printer in the native code and send its
-      // capabilities back with other local printers.
-      this.insertDestination_(this.createLocalPdfPrintDestination_());
-      this.resetAutoSelectTimeout_();
-    },
 
-    /**
-     * Resets destination auto selection timeout.
-     * @private
-     */
-    resetAutoSelectTimeout_: function() {
-      this.cancelAutoSelectTimeout_();
-      this.autoSelectTimeout_ =
-          setTimeout(this.onAutoSelectFailed_.bind(this),
-                     DestinationStore.AUTO_SELECT_TIMEOUT_);
-    },
-
-    /**
-     * Cancels destination auto selection timeout.
-     * @private
-     */
-    cancelAutoSelectTimeout_: function() {
-      if (this.autoSelectTimeout_ != null) {
-        clearTimeout(this.autoSelectTimeout_);
-        this.autoSelectTimeout_ = null;
-      }
+      clearTimeout(this.autoSelectTimeout_);
+      this.autoSelectTimeout_ = setTimeout(
+          this.selectDefaultDestination_.bind(this),
+          DestinationStore.AUTO_SELECT_TIMEOUT_);
     },
 
     /**
@@ -876,20 +879,12 @@ cr.define('print_preview', function() {
     onDestinationsReload_: function() {
       this.reset_();
       this.isInAutoSelectMode_ = true;
+      this.createLocalPdfPrintDestination_();
       this.startLoadLocalDestinations();
       this.startLoadCloudDestinations();
       this.startLoadPrivetDestinations();
     },
 
-    /**
-     * Called when auto-selection fails. Selects the first destination in store.
-     * @private
-     */
-    onAutoSelectFailed_: function() {
-      this.cancelAutoSelectTimeout_();
-      this.selectDefaultDestination_();
-    },
-
     // TODO(vitalybuka): Remove three next functions replacing Destination.id
     //    and Destination.origin by complex ID.
     /**

chrome/browser/resources/print_preview/native_layer.js

@@ -403,6 +403,7 @@ cr.define('print_preview', function() {
 
       var nativeInitialSettings = new print_preview.NativeInitialSettings(
           initialSettings['printAutomaticallyInKioskMode'] || false,
+          initialSettings['appKioskMode'] || false,
           initialSettings['hidePrintWithSystemDialogLink'] || false,
           numberFormatSymbols[0] || ',',
           numberFormatSymbols[1] || '.',
@@ -425,10 +426,11 @@ cr.define('print_preview', function() {
      * @param {string} cloudPrintURL The URL to use for cloud print servers.
      * @private
      */
-    onSetUseCloudPrint_: function(cloudPrintURL) {
+    onSetUseCloudPrint_: function(settings) {
       var cloudPrintEnableEvent = new Event(
           NativeLayer.EventType.CLOUD_PRINT_ENABLE);
-      cloudPrintEnableEvent.baseCloudPrintUrl = cloudPrintURL;
+      cloudPrintEnableEvent.baseCloudPrintUrl = settings['cloudPrintUrl'] || '';
+      cloudPrintEnableEvent.appKioskMode = settings['appKioskMode'] || false;
       this.dispatchEvent(cloudPrintEnableEvent);
     },
 
@@ -695,6 +697,8 @@ cr.define('print_preview', function() {
    * Initial settings retrieved from the native layer.
    * @param {boolean} isInKioskAutoPrintMode Whether the print preview should be
    *     in auto-print mode.
+   * @param {boolean} isInAppKioskMode Whether the print preview is in App Kiosk
+   *     mode.
    * @param {string} thousandsDelimeter Character delimeter of thousands digits.
    * @param {string} decimalDelimeter Character delimeter of the decimal point.
    * @param {!print_preview.MeasurementSystem.UnitType} unitType Unit type of
@@ -713,6 +717,7 @@ cr.define('print_preview', function() {
    */
   function NativeInitialSettings(
       isInKioskAutoPrintMode,
+      isInAppKioskMode,
       hidePrintWithSystemDialogLink,
       thousandsDelimeter,
       decimalDelimeter,
@@ -731,6 +736,13 @@ cr.define('print_preview', function() {
      */
     this.isInKioskAutoPrintMode_ = isInKioskAutoPrintMode;
 
+    /**
+     * Whether the print preview should switch to App Kiosk mode.
+     * @type {boolean}
+     * @private
+     */
+    this.isInAppKioskMode_ = isInAppKioskMode;
+
     /**
      * Whether we should hide the link which shows the system print dialog.
      * @type {boolean}
@@ -810,6 +822,14 @@ cr.define('print_preview', function() {
       return this.isInKioskAutoPrintMode_;
     },
 
+    /**
+     * @return {boolean} Whether the print preview should switch to App Kiosk
+     *     mode.
+     */
+    get isInAppKioskMode() {
+      return this.isInAppKioskMode_;
+    },
+
     /**
      * @return {boolean} Whether we should hide the link which shows the
            system print dialog.

chrome/browser/resources/print_preview/print_preview.js

@@ -193,6 +193,14 @@ cr.define('print_preview', function() {
      */
     this.isInKioskAutoPrintMode_ = false;
 
+    /**
+     * Whether Print Preview is in App Kiosk mode, basically, use only printers
+     * available for the device.
+     * @type {boolean}
+     * @private
+     */
+    this.isInAppKioskMode_ = false;
+
     /**
      * State of the print preview UI.
      * @type {print_preview.PrintPreview.UiState_}
@@ -530,6 +538,7 @@ cr.define('print_preview', function() {
 
       var settings = event.initialSettings;
       this.isInKioskAutoPrintMode_ = settings.isInKioskAutoPrintMode;
+      this.isInAppKioskMode_ = settings.isInAppKioskMode;
 
       // The following components must be initialized in this order.
       this.appState_.init(
@@ -544,12 +553,13 @@ cr.define('print_preview', function() {
           settings.decimalDelimeter,
           settings.unitType,
           settings.selectionOnly);
-      this.destinationStore_.init();
+      this.destinationStore_.init(settings.isInAppKioskMode);
       this.appState_.setInitialized();
 
       $('document-title').innerText = settings.documentTitle;
       setIsVisible($('system-dialog-link'),
                    !settings.hidePrintWithSystemDialogLink);
+      setIsVisible($('cloud-print-dialog-link'), !settings.isInAppKioskMode);
     },
 
     /**
@@ -563,7 +573,8 @@ cr.define('print_preview', function() {
       this.cloudPrintInterface_ = new cloudprint.CloudPrintInterface(
           event.baseCloudPrintUrl,
           this.nativeLayer_,
-          this.userInfo_);
+          this.userInfo_,
+          event.appKioskMode);
       this.tracker.add(
           this.cloudPrintInterface_,
           cloudprint.CloudPrintInterface.EventType.SUBMIT_DONE,
@@ -662,7 +673,9 @@ cr.define('print_preview', function() {
      */
     onCloudPrintError_: function(event) {
       if (event.status == 403) {
-        this.destinationSearch_.showCloudPrintPromo();
+        if (!this.isInAppKioskMode_) {
+          this.destinationSearch_.showCloudPrintPromo();
+        }
       } else if (event.status == 0) {
         return; // Ignore, the system does not have internet connectivity.
       } else {

chrome/browser/resources/print_preview/search/destination_list.js

@@ -128,7 +128,10 @@ cr.define('print_preview', function() {
       numItems = Math.min(numItems, this.destinations_.length);
       var headerHeight =
           this.getChildElement('.destination-list > header').offsetHeight;
-      return headerHeight + numItems * DestinationList.HEIGHT_OF_ITEM_;
+      return headerHeight + (numItems > 0 ?
+          numItems * DestinationList.HEIGHT_OF_ITEM_ :
+          // To account for "No destinations found" message.
+          DestinationList.HEIGHT_OF_ITEM_);
     },
 
     /** @param {boolean} isVisible Whether the throbber is visible. */

chrome/browser/resources/print_preview/settings/destination_settings.css

@@ -9,7 +9,7 @@
 
 #destination-settings .throbber {
   display: block;
-  margin-bottom: 14px;
+  margin-bottom: 4px;
   margin-top: 8px;
 }
 
@@ -17,7 +17,6 @@
   -webkit-box-align: center;
   display: -webkit-box;
   height: 28px;
-  margin-bottom: 10px;
 }
 
 .destination-settings-box.stale {
@@ -25,7 +24,7 @@
 }
 
 #destination-settings .destination-settings-change-button {
-  margin-bottom: 10px;
+  margin: 10px 0;
 }
 
 .destination-settings-icon {

chrome/browser/resources/print_preview/settings/destination_settings.js

@@ -140,8 +140,9 @@ cr.define('print_preview', function() {
       }
 
       setIsVisible(
-          this.getChildElement('.throbber-container'), destination == null);
-      setIsVisible(destinationSettingsBoxEl, destination != null);
+          this.getChildElement('.throbber-container'),
+          this.destinationStore_.isAutoSelectDestinationInProgress);
+      setIsVisible(destinationSettingsBoxEl, !!destination);
     },
 
     onSelectedDestinationNameSet_: function() {

chrome/browser/ui/webui/print_preview/print_preview_handler.cc

@@ -27,6 +27,7 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
+#include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
@@ -182,6 +183,11 @@ const char kNumberFormat[] = "numberFormat";
 // Name of a dictionary field specifying whether to print automatically in
 // kiosk mode. See http://crbug.com/31395.
 const char kPrintAutomaticallyInKioskMode[] = "printAutomaticallyInKioskMode";
+// Dictionary field to indicate whether Chrome is running in forced app (app
+// kiosk) mode. It's not the same as desktop Chrome kiosk (the one above).
+const char kAppKioskMode[] = "appKioskMode";
+// Dictionary field to store Cloud Print base URL.
+const char kCloudPrintUrl[] = "cloudPrintUrl";
 #if defined(OS_WIN)
 const char kHidePrintWithSystemDialogLink[] = "hidePrintWithSystemDialogLink";
 #endif
@@ -1195,6 +1201,8 @@ void PrintPreviewHandler::SendInitialSettings(
   base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
   initial_settings.SetBoolean(kPrintAutomaticallyInKioskMode,
                               cmdline->HasSwitch(switches::kKioskModePrinting));
+  initial_settings.SetBoolean(kAppKioskMode,
+                              chrome::IsRunningInForcedAppMode());
 #if defined(OS_WIN)
   // In Win8 metro, the system print dialog can only open on the desktop.  Doing
   // so will cause the browser to appear hung, so we don't show the link in
@@ -1251,9 +1259,11 @@ void PrintPreviewHandler::SendCloudPrintEnabled() {
       preview_web_contents()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
   if (prefs->GetBoolean(prefs::kCloudPrintSubmitEnabled)) {
-    GURL gcp_url(cloud_devices::GetCloudPrintURL());
-    base::StringValue gcp_url_value(gcp_url.spec());
-    web_ui()->CallJavascriptFunction("setUseCloudPrint", gcp_url_value);
+    base::DictionaryValue settings;
+    settings.SetString(kCloudPrintUrl,
+                       GURL(cloud_devices::GetCloudPrintURL()).spec());
+    settings.SetBoolean(kAppKioskMode, chrome::IsRunningInForcedAppMode());
+    web_ui()->CallJavascriptFunction("setUseCloudPrint", settings);
   }
 }
 

chrome/test/data/webui/print_preview.js

@@ -115,6 +115,7 @@ PrintPreviewWebUITest.prototype = {
 
     this.initialSettings_ = new print_preview.NativeInitialSettings(
       false /*isInKioskAutoPrintMode*/,
+      false /*isInAppKioskMode*/,
       false /*hidePrintWithSystemDialogLink*/,
       ',' /*thousandsDelimeter*/,
       '.' /*decimalDelimeter*/,
@@ -475,9 +476,8 @@ TEST_F('PrintPreviewWebUITest', 'CustomMarginsControlsCheck', function() {
 });
 
 // Page layout has zero margins. Hide header and footer option.
-TEST_F('PrintPreviewWebUITest',
-       'PageLayoutHasNoMarginsHideHeaderFooter',
-       function() {
+TEST_F('PrintPreviewWebUITest', 'PageLayoutHasNoMarginsHideHeaderFooter',
+    function() {
   var initialSettingsSetEvent =
       new Event(print_preview.NativeLayer.EventType.INITIAL_SETTINGS_SET);
   initialSettingsSetEvent.initialSettings = this.initialSettings_;
@@ -508,9 +508,8 @@ TEST_F('PrintPreviewWebUITest',
 });
 
 // Page layout has half-inch margins. Show header and footer option.
-TEST_F('PrintPreviewWebUITest',
-       'PageLayoutHasMarginsShowHeaderFooter',
-       function() {
+TEST_F('PrintPreviewWebUITest', 'PageLayoutHasMarginsShowHeaderFooter',
+    function() {
   var initialSettingsSetEvent =
       new Event(print_preview.NativeLayer.EventType.INITIAL_SETTINGS_SET);
   initialSettingsSetEvent.initialSettings = this.initialSettings_;
@@ -649,12 +648,12 @@ TEST_F('PrintPreviewWebUITest', 'TestColorSettingsColor', function() {
   this.setUpPreview();
 
   var capsSetEvent =
-    new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
+      new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
   capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
   capsSetEvent.settingsInfo.capabilities.printer.color = {
-  "option": [
-    {"is_default": true, "type": "STANDARD_COLOR"}
-  ]
+    "option": [
+      {"is_default": true, "type": "STANDARD_COLOR"}
+    ]
   };
   this.nativeLayer_.dispatchEvent(capsSetEvent);
 
@@ -669,9 +668,9 @@ TEST_F('PrintPreviewWebUITest', 'TestColorSettingsCustomColor', function() {
      new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
   capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
   capsSetEvent.settingsInfo.capabilities.printer.color = {
-   "option": [
-     {"is_default": true, "type": "CUSTOM_COLOR", "vendor_id": "42"}
-   ]
+    "option": [
+      {"is_default": true, "type": "CUSTOM_COLOR", "vendor_id": "42"}
+    ]
   };
   this.nativeLayer_.dispatchEvent(capsSetEvent);
 
@@ -709,10 +708,10 @@ TEST_F('PrintPreviewWebUITest',
      new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
   capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
   capsSetEvent.settingsInfo.capabilities.printer.color = {
-   "option": [
-     {"is_default": true, "type": "STANDARD_MONOCHROME"},
-     {"type": "STANDARD_COLOR"}
-   ]
+    "option": [
+      {"is_default": true, "type": "STANDARD_MONOCHROME"},
+      {"type": "STANDARD_COLOR"}
+    ]
   };
   this.nativeLayer_.dispatchEvent(capsSetEvent);
 
@@ -727,13 +726,13 @@ TEST_F('PrintPreviewWebUITest',
   this.setUpPreview();
 
   var capsSetEvent =
-    new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
+      new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
   capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
   capsSetEvent.settingsInfo.capabilities.printer.color = {
-  "option": [
-    {"type": "CUSTOM_MONOCHROME", "vendor_id": "42"},
-    {"is_default": true, "type": "CUSTOM_COLOR", "vendor_id": "43"}
-  ]
+    "option": [
+      {"type": "CUSTOM_MONOCHROME", "vendor_id": "42"},
+      {"is_default": true, "type": "CUSTOM_COLOR", "vendor_id": "43"}
+    ]
   };
   this.nativeLayer_.dispatchEvent(capsSetEvent);