Print Preview: Open settings page via handler

This allows the manage button to work correctly in Incognito mode.

Bug: 929640
Change-Id: Ia0295b1fc6576071a9e5a41fb0723fc121e36eb5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2150692Reviewed-by: dpapad <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759422}

chrome/browser/resources/print_preview/native_layer.js

@@ -259,12 +259,7 @@ export class NativeLayer {
    *  printing settings in the Settings App.
    */
   openSettingsPrintPage() {
-    // <if expr="chromeos">
     chrome.send('openPrinterSettings');
-    // </if>
-    // <if expr="not chromeos">
-    window.open('chrome://settings/printing');
-    // </if>
   }
 
   /**

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

@@ -603,12 +603,11 @@ void PrintPreviewHandler::RegisterMessages() {
       base::BindRepeating(
           &PrintPreviewHandler::HandleGrantExtensionPrinterAccess,
           base::Unretained(this)));
-#if defined(OS_CHROMEOS)
   web_ui()->RegisterMessageCallback(
       "openPrinterSettings",
       base::BindRepeating(&PrintPreviewHandler::HandleOpenPrinterSettings,
                           base::Unretained(this)));
-
+#if defined(OS_CHROMEOS)
   web_ui()->RegisterMessageCallback(
       "getEulaUrl", base::BindRepeating(&PrintPreviewHandler::HandleGetEulaUrl,
                                         base::Unretained(this)));
@@ -1038,13 +1037,21 @@ void PrintPreviewHandler::HandleClosePreviewDialog(
       regenerate_preview_request_count_);
 }
 
-#if defined(OS_CHROMEOS)
 void PrintPreviewHandler::HandleOpenPrinterSettings(
     const base::ListValue* args) {
+#if defined(OS_CHROMEOS)
   chrome::SettingsWindowManager::GetInstance()->ShowOSSettings(
       Profile::FromWebUI(web_ui()), chrome::kNativePrintingSettingsSubPage);
+#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());
 

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

@@ -233,10 +233,11 @@ class PrintPreviewHandler : public content::WebUIMessageHandler,
   // preview is displayed.
   void HandleGetInitialSettings(const base::ListValue* args);
 
-#if defined(OS_CHROMEOS)
-  // Opens printer settings in the Chrome OS Settings App.
+  // Opens printer settings in the Chrome OS Settings App or the
+  // chrome://settings page.
   void HandleOpenPrinterSettings(const base::ListValue* args);
 
+#if defined(OS_CHROMEOS)
   // Gets the EULA URL.
   void HandleGetEulaUrl(const base::ListValue* args);
 #endif