Simplified print preview printer selection to be more consistent with Chrome

chrome/browser/ui/webui/print_preview_handler.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/ui/webui/print_preview_handler.h"
 
 #include <ctype.h>
 #include <string>
 
 #include "base/base64.h"
@@ skipping 547 matching lines @@
   web_ui_->RegisterMessageCallback("getPreview",
       NewCallback(this, &PrintPreviewHandler::HandleGetPreview));
   web_ui_->RegisterMessageCallback("print",
       NewCallback(this, &PrintPreviewHandler::HandlePrint));
   web_ui_->RegisterMessageCallback("getPrinterCapabilities",
       NewCallback(this, &PrintPreviewHandler::HandleGetPrinterCapabilities));
   web_ui_->RegisterMessageCallback("showSystemDialog",
       NewCallback(this, &PrintPreviewHandler::HandleShowSystemDialog));
   web_ui_->RegisterMessageCallback("signIn",
       NewCallback(this, &PrintPreviewHandler::HandleSignin));
-  web_ui_->RegisterMessageCallback("printWithCloudPrint",
-      NewCallback(this, &PrintPreviewHandler::HandlePrintWithCloudPrint));
   web_ui_->RegisterMessageCallback("manageCloudPrinters",
       NewCallback(this, &PrintPreviewHandler::HandleManageCloudPrint));
   web_ui_->RegisterMessageCallback("manageLocalPrinters",
       NewCallback(this, &PrintPreviewHandler::HandleManagePrinters));
   web_ui_->RegisterMessageCallback("reloadCrashedInitiatorTab",
       NewCallback(this, &PrintPreviewHandler::HandleReloadCrashedInitiatorTab));
   web_ui_->RegisterMessageCallback("closePrintPreviewTab",
       NewCallback(this, &PrintPreviewHandler::HandleClosePreviewTab));
   web_ui_->RegisterMessageCallback("hidePreview",
       NewCallback(this, &PrintPreviewHandler::HandleHidePreview));
@@ skipping 128 matching lines @@
   int color_mode;
   if (!settings->GetInteger(printing::kSettingColor, &color_mode))
     color_mode = printing::GRAY;
   last_used_color_setting_ = (color_mode != printing::GRAY);
 
   bool print_to_pdf = false;
   settings->GetBoolean(printing::kSettingPrintToPDF, &print_to_pdf);
 
   settings->SetBoolean(printing::kSettingHeaderFooterEnabled, false);
 
-  bool print_to_cloud = settings->HasKey(printing::kSettingCloudPrintId);
-  if (print_to_cloud) {
+  bool is_cloud_printer = settings->HasKey(printing::kSettingCloudPrintId);
+  bool is_cloud_dialog = false;
+  settings->GetBoolean(printing::kSettingCloudPrintDialog, &is_cloud_dialog);
+  if (is_cloud_printer) {
     std::string print_ticket;
     args->GetString(1, &print_ticket);
     SendCloudPrintJob(*settings, print_ticket);
   } else if (print_to_pdf) {
     HandlePrintToPdf(*settings);
+  } else if (is_cloud_dialog) {
+    HandlePrintWithCloudPrint();
   } else {
     ReportPrintSettingsStats(*settings);
     ReportUserActionHistogram(PRINT_TO_PRINTER);
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.PrintToPrinter",
                          GetPageCountFromSettingsDictionary(*settings));
 
     // This tries to activate the initiator tab as well, so do not clear the
     // association with the initiator tab yet.
     HidePreviewTab();
 
@@ skipping 88 matching lines @@
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(task.get(),
                         &PrintSystemTaskProxy::GetPrinterCapabilities,
                         printer_name));
 }
 
 void PrintPreviewHandler::HandleSignin(const ListValue* /*args*/) {
   cloud_print_signin_dialog::CreateCloudPrintSigninDialog(preview_tab());
 }
 
-void PrintPreviewHandler::HandlePrintWithCloudPrint(const ListValue* /*args*/) {
+void PrintPreviewHandler::HandlePrintWithCloudPrint() {
   // Record the number of times the user asks to print via cloud print
   // instead of the print preview dialog.
   ReportStats();
   ReportUserActionHistogram(PRINT_WITH_CLOUD_PRINT);
 
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(web_ui_);
   scoped_refptr<RefCountedBytes> data;
   print_preview_ui->GetPrintPreviewDataForIndex(
       printing::COMPLETE_PREVIEW_DOCUMENT_INDEX, &data);
   CHECK(data.get());
@@ skipping 311 matching lines @@
     return;
 
   // We no longer require the initiator tab details. Remove those details
   // associated with the preview tab to allow the initiator tab to create
   // another preview tab.
   printing::PrintPreviewTabController* tab_controller =
       printing::PrintPreviewTabController::GetInstance();
   if (tab_controller)
     tab_controller->EraseInitiatorTabInfo(preview_tab_wrapper());
 }