Update register and accept Cloud Print flow for GDPR

Add GDPR text to the local discovery and Print Preview flows for
registering and accepting cloud printers, respectively.

Bug: 826591
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I4ed895c9b5db992dcd64cdcfc86206860d896739
Reviewed-on: https://chromium-review.googlesource.com/1005571
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550033}

chrome/app/generated_resources.grd

@@ -10063,9 +10063,6 @@ For more information, visit our <ph name="BEGIN_LINK">&lt;a target="_blank" href
         <message name="IDS_LOCAL_DISCOVERY_DEVICES_PAGE_TITLE" desc="Title for devices page">
           Devices
         </message>
-        <message name="IDS_LOCAL_DISCOVERY_REGISTER_PRINTER_CONFIRMATION" desc="Confirmation for registering a printer to Google Cloud Print">
-          Do you wish to register the printer <ph name="PRINTER_NAME">$1</ph> to Google Cloud Print?
-        </message>
         <message name="IDS_LOCAL_DISCOVERY_REGISTER_DEVICE_CONFIRMATION" desc="Confirmation for registering a device to Google Cloud Devices">
           Do you wish to register <ph name="DEVICE_NAME">$1</ph> to Google Cloud Devices?
         </message>
@@ -10166,6 +10163,11 @@ For more information, visit our <ph name="BEGIN_LINK">&lt;a target="_blank" href
         Printer registration has timed out. In order to register a printer, you must confirm registration on the printer.
       </message>
 
+      <!--Printer registration message for local discovery and Print Preview-->
+      <message name="IDS_CLOUD_PRINT_REGISTER_PRINTER_INFORMATION" desc="Information about registering printers with Google Cloud Print shown to the user before they confirm registration.">
+        Documents are <ph name="BEGIN_LINK_HELP">&lt;a is="action-link" href="https://support.google.com/cloudprint/answer/2541843" target="_blank"&gt;</ph>sent to Google<ph name="END_LINK_HELP">&lt;/a&gt;</ph> to prepare them for printing. View, edit and manage your printers and printer history on the <ph name="BEGIN_LINK_DASHBOARD">&lt;a is="action-link" href="https://www.google.com/cloudprint#jobs" target="_blank"&gt;</ph>Google Cloud Print dashboard<ph name="END_LINK_DASHBOARD">&lt;/a&gt;</ph>.
+      </message>
+
       <!--Tab alert tooltip strings-->
       <message name="IDS_TOOLTIP_TAB_ALERT_STATE_MEDIA_RECORDING" desc="Extra tool tip text, when the tab is recording media.">
         This tab is using your camera or microphone.

chrome/browser/resources/local_discovery/local_discovery.html

@@ -26,6 +26,7 @@
           <h1>$i18n{confirmRegistration}</h1>
           <div class="dialog-contents">
             <div id="register-message">
+              $i18nRaw{registerPrinterInformationMessage}
             </div>
 
             <div class="button-list">
@@ -38,10 +39,8 @@
                 </a>
               </div>
               <button class="register-cancel">$i18n{cancel}</button>
-              <button id="register-continue-button">
-                $i18n{serviceRegister}
-              </button>
-          </div>
+              <button id="register-continue">$i18n{confirm}</button>
+            </div>
           </div>
         </div>
 

chrome/browser/resources/local_discovery/local_discovery.js

@@ -118,6 +118,7 @@ cr.define('local_discovery', function() {
     deviceContainer: function() {
       return $('register-device-list');
     },
+
     /**
      * Register the device.
      */
@@ -133,11 +134,8 @@ cr.define('local_discovery', function() {
      */
     showRegister: function() {
       recordUmaEvent(DEVICES_PAGE_EVENTS.REGISTER_CLICKED);
-      $('register-message').textContent = loadTimeData.getStringF(
-          isPrinter(this.info.type) ? 'registerPrinterConfirmMessage' :
-                                      'registerDeviceConfirmMessage',
-          this.info.display_name);
-      $('register-continue-button').onclick = this.register.bind(this);
+      $('register-continue').onclick = this.register.bind(this);
+
       showRegisterOverlay();
     },
     /**
@@ -521,7 +519,7 @@ cr.define('local_discovery', function() {
         isUserLoggedIn || isUserSupervisedOrOffTheRecord;
     $('register-overlay-login-promo').hidden =
         isUserLoggedIn || isUserSupervisedOrOffTheRecord;
-    $('register-continue-button').disabled =
+    $('register-continue').disabled =
         !isUserLoggedIn || isUserSupervisedOrOffTheRecord;
 
     $('my-devices-container').hidden = userSupervisedOrOffTheRecord;

chrome/browser/resources/print_preview/search/destination_search.css

@@ -89,6 +89,10 @@
   -webkit-margin-start: 10px;
 }
 
+#destination-search .invitation-cloud-print-information {
+  padding-top: 12px;
+}
+
 #destination-search #invitation-process-throbber {
   display: block;
 }

chrome/browser/resources/print_preview/search/destination_search.html

@@ -23,6 +23,9 @@
         <button class="invitation-reject-button">$i18n{reject}</button>
         <div id="invitation-process-throbber" class="throbber" hidden></div>
       </div>
+      <div class="invitation-cloud-print-information">
+        $i18nRaw{registerPrinterInformationMessage}
+      </div>
     </div>
     <div class="cloudprint-promo gray-bottom-bar" hidden>
       <img src="../images/cloud.png" class="icon" alt="">

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

@@ -791,7 +791,7 @@ cr.define('print_preview', function() {
      */
     onWindowResize_: function() {
       this.reflowLists_();
-    }
+    },
   };
 
   // Export

chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc

@@ -36,10 +36,8 @@ content::WebUIDataSource* CreateLocalDiscoveryHTMLSource() {
                              IDS_LOCAL_DISCOVERY_SERVICE_REGISTER);
   source->AddLocalizedString("manageDevice", IDS_LOCAL_DISCOVERY_MANAGE_DEVICE);
 
-  source->AddLocalizedString("registerPrinterConfirmMessage",
-                             IDS_LOCAL_DISCOVERY_REGISTER_PRINTER_CONFIRMATION);
-  source->AddLocalizedString("registerDeviceConfirmMessage",
-                             IDS_LOCAL_DISCOVERY_REGISTER_DEVICE_CONFIRMATION);
+  source->AddLocalizedString("registerPrinterInformationMessage",
+                             IDS_CLOUD_PRINT_REGISTER_PRINTER_INFORMATION);
   source->AddLocalizedString("registerUser",
                              IDS_LOCAL_DISCOVERY_REGISTER_USER);
   source->AddLocalizedString("confirmRegistration",
@@ -77,6 +75,7 @@ content::WebUIDataSource* CreateLocalDiscoveryHTMLSource() {
   source->AddLocalizedString("printersOnNetworkMultiple",
                              IDS_LOCAL_DISCOVERY_PRINTERS_ON_NETWORK_MULTIPLE);
   source->AddLocalizedString("cancel", IDS_CANCEL);
+  source->AddLocalizedString("confirm", IDS_CONFIRM);
   source->AddLocalizedString("ok", IDS_OK);
   source->AddLocalizedString("loading", IDS_LOCAL_DISCOVERY_LOADING);
   source->AddLocalizedString("addPrinters", IDS_LOCAL_DISCOVERY_ADD_PRINTERS);

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

@@ -352,6 +352,8 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
       "groupPrinterSharingInviteText", IDS_PRINT_PREVIEW_GROUP_INVITE_TEXT);
   source->AddLocalizedString(
       "printerSharingInviteText", IDS_PRINT_PREVIEW_INVITE_TEXT);
+  source->AddLocalizedString("registerPrinterInformationMessage",
+                             IDS_CLOUD_PRINT_REGISTER_PRINTER_INFORMATION);
   source->AddLocalizedString("moreOptionsLabel", IDS_MORE_OPTIONS_LABEL);
   source->AddLocalizedString("lessOptionsLabel", IDS_LESS_OPTIONS_LABEL);
 #if defined(OS_CHROMEOS)

chrome/test/data/webui/local_discovery_ui_test.js

@@ -30,7 +30,7 @@ function registerShowOverlay() {
 }
 
 function registerBegin() {
-  var button = $("register-continue-button");
+  var button = $('register-continue');
   assertTrue(button != null);
 
   assertFalse($('register-page-confirm').hidden);