Print Preview: Redirect manage printers button to the OS printer dialog

Bug: 1144931
Change-Id: Ia5822311a43935e2086613c5b2ff0470d342544e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2520081
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824982}

chrome/browser/resources/print_preview/native_layer.js

@@ -226,10 +226,10 @@ export class NativeLayer {
   getPreview(printTicket) {}
 
   /**
-   * Opens the chrome://settings printing page. For Chrome OS, open the
-   * printing settings in the Settings App.
+   * Opens the OS's printer manager dialog. For Chrome OS, open the printing
+   * settings in the Settings App.
    */
-  openSettingsPrintPage() {}
+  managePrinters() {}
 
   /**
    * Requests that the document be printed.
@@ -348,8 +348,8 @@ export class NativeLayerImpl {
   }
 
   /** @override */
-  openSettingsPrintPage() {
-    chrome.send('openPrinterSettings');
+  managePrinters() {
+    chrome.send('managePrinters');
   }
 
   /** @override */

chrome/browser/resources/print_preview/ui/destination_dialog.html

@@ -98,7 +98,7 @@
     margin-bottom: 16px;
   }
 
-  iron-icon {
+  .destinations-status iron-icon {
     --google-orange-600: rgb(232, 113, 10);  /* e8710a */
     fill: var(--google-orange-600);
     flex-shrink: 0;
@@ -106,6 +106,11 @@
     padding-inline-start: 4px;
   }
 
+  cr-button iron-icon {
+    --iron-icon-fill-color: currentColor;
+    margin-inline-start: 8px;
+  }
+
   #warning-message {
     color: var(--cr-primary-text-color);
   }
@@ -145,8 +150,9 @@
     </print-preview-provisional-destination-resolver>
   </div>
   <div slot="button-container">
-    <cr-button on-click="onOpenSettingsPrintPage_">
+    <cr-button on-click="onManageButtonClick_">
       $i18n{manage}
+      <iron-icon icon="cr:open-in-new"></iron-icon>
     </cr-button>
     <cr-button class="cancel-button" on-click="onCancelButtonClick_">
       $i18n{cancel}

chrome/browser/resources/print_preview/ui/destination_dialog.js

@@ -435,8 +435,8 @@ Polymer({
   },
 
   /** @private */
-  onOpenSettingsPrintPage_() {
+  onManageButtonClick_() {
     this.metrics_.record(Metrics.DestinationSearchBucket.MANAGE_BUTTON_CLICKED);
-    NativeLayerImpl.getInstance().openSettingsPrintPage();
+    NativeLayerImpl.getInstance().managePrinters();
   },
 });

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

@@ -449,9 +449,10 @@ void PrintPreviewHandler::RegisterMessages() {
           &PrintPreviewHandler::HandleGrantExtensionPrinterAccess,
           base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
-      "openPrinterSettings",
-      base::BindRepeating(&PrintPreviewHandler::HandleOpenPrinterSettings,
+      "managePrinters",
+      base::BindRepeating(&PrintPreviewHandler::HandleManagePrinters,
                           base::Unretained(this)));
+
 #if defined(OS_CHROMEOS)
   web_ui()->RegisterMessageCallback(
       "getEulaUrl", base::BindRepeating(&PrintPreviewHandler::HandleGetEulaUrl,
@@ -884,21 +885,6 @@ void PrintPreviewHandler::HandleClosePreviewDialog(
       regenerate_preview_request_count_);
 }
 
-void PrintPreviewHandler::HandleOpenPrinterSettings(
-    const base::ListValue* args) {
-#if defined(OS_CHROMEOS)
-  chrome::SettingsWindowManager::GetInstance()->ShowOSSettings(
-      Profile::FromWebUI(web_ui()),
-      chromeos::settings::mojom::kPrintingDetailsSubpagePath);
-#else
-  GURL url(chrome::GetSettingsUrl(chrome::kPrintingSettingsSubPage));
-  content::OpenURLParams params(url, content::Referrer(),
-                                WindowOpenDisposition::NEW_FOREGROUND_TAB,
-                                ui::PAGE_TRANSITION_LINK, false);
-  preview_web_contents()->OpenURL(params);
-#endif
-}
-
 #if defined(OS_CHROMEOS)
 void PrintPreviewHandler::HandleGetEulaUrl(const base::ListValue* args) {
   CHECK_EQ(2U, args->GetSize());
@@ -1430,4 +1416,15 @@ void PrintPreviewHandler::OnPrinterStatusUpdated(
 }
 #endif
 
+void PrintPreviewHandler::HandleManagePrinters(const base::ListValue* args) {
+#if defined(OS_CHROMEOS)
+  chrome::SettingsWindowManager::GetInstance()->ShowOSSettings(
+      Profile::FromWebUI(web_ui()),
+      chromeos::settings::mojom::kPrintingDetailsSubpagePath);
+#else
+  printing::PrinterManagerDialog::ShowPrinterManagerDialog(
+      Profile::FromWebUI(web_ui()));
+#endif
+}
+
 }  // namespace printing

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

@@ -234,9 +234,9 @@ class PrintPreviewHandler : public content::WebUIMessageHandler,
   // preview is displayed.
   void HandleGetInitialSettings(const base::ListValue* args);
 
-  // Opens printer settings in the Chrome OS Settings App or the
-  // chrome://settings page.
-  void HandleOpenPrinterSettings(const base::ListValue* args);
+  // Opens printer settings in the Chrome OS Settings App or OS's printer manger
+  // dialog. |args| is unused.
+  void HandleManagePrinters(const base::ListValue* args);
 
 #if defined(OS_CHROMEOS)
   // Gets the EULA URL.

chrome/test/data/webui/print_preview/native_layer_stub.js

@@ -262,7 +262,7 @@ export class NativeLayerStub extends TestBrowserProxy {
   cancelPendingPrintRequest() {}
 
   /** @override */
-  openSettingsPrintPage() {}
+  managePrinters() {}
 
   /**
    * @param {!NativeInitialSettings} settings The settings