Fixed reporting of PrintPreview.PageCount.PrintToCloudPrintWebDialog.

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

 // Copyright (c) 2012 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/print_preview_handler.h"
 
 #include <ctype.h>
 
 #include <string>
 
@@ skipping 382 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("saveAppState",
       base::Bind(&PrintPreviewHandler::HandleSaveAppState,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("getInitialSettings",
       base::Bind(&PrintPreviewHandler::HandleGetInitialSettings,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("reportUiEvent",
       base::Bind(&PrintPreviewHandler::HandleReportUiEvent,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("printWithCloudPrint",
-      base::Bind(&PrintPreviewHandler::HandlePrintWithCloudPrint,
+  web_ui()->RegisterMessageCallback("printWithCloudPrintDialog",
+      base::Bind(&PrintPreviewHandler::HandlePrintWithCloudPrintDialog,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("forceOpenNewTab",
         base::Bind(&PrintPreviewHandler::HandleForceOpenNewTab,
                    base::Unretained(this)));
 }
 
 WebContents* PrintPreviewHandler::preview_web_contents() const {
   return web_ui()->GetWebContents();
 }
 
@@ skipping 96 matching lines @@
 
   scoped_ptr<DictionaryValue> settings(GetSettingsDictionary(args));
   if (!settings.get())
     return;
 
   // Never try to add headers/footers here. It's already in the generated PDF.
   settings->SetBoolean(printing::kSettingHeaderFooterEnabled, false);
 
   bool print_to_pdf = false;
   bool is_cloud_printer = false;
-  bool is_cloud_dialog = false;
 
   bool open_pdf_in_preview = false;
 #if defined(OS_MACOSX)
   open_pdf_in_preview = settings->HasKey(printing::kSettingOpenPDFInPreview);
 #endif
 
   if (!open_pdf_in_preview) {
     settings->GetBoolean(printing::kSettingPrintToPDF, &print_to_pdf);
-    settings->GetBoolean(printing::kSettingCloudPrintDialog, &is_cloud_dialog);
     is_cloud_printer = settings->HasKey(printing::kSettingCloudPrintId);
   }
 
   int page_count = 0;
   settings->GetInteger(printing::kSettingPreviewPageCount, &page_count);
 
   if (print_to_pdf) {
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.PrintToPDF", page_count);
     ReportUserActionHistogram(PRINT_TO_PDF);
     PrintToPdf();
     return;
   }
 
   scoped_refptr<base::RefCountedBytes> data;
   string16 title;
   if (!GetPreviewDataAndTitle(&data, &title)) {
     // Nothing to print, no preview available.
     return;
   }
 
   if (is_cloud_printer) {
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.PrintToCloudPrint",
                          page_count);
     ReportUserActionHistogram(PRINT_WITH_CLOUD_PRINT);
     SendCloudPrintJob(data);
-  } else if (is_cloud_dialog) {
-    UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.PrintToCloudPrintWebDialog",
-                         page_count);
-    PrintWithCloudPrintDialog(data, title);
   } else {
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.PrintToPrinter", page_count);
     ReportUserActionHistogram(PRINT_TO_PRINTER);
     ReportPrintSettingsStats(*settings);
 
     // This tries to activate the initiator tab as well, so do not clear the
     // association with the initiator tab yet.
     PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
         web_ui()->GetController());
     print_preview_ui->OnHidePreviewDialog();
@@ skipping 121 matching lines @@
 
 void PrintPreviewHandler::HandleGetAccessToken(const base::ListValue* args) {
   std::string type;
   if (!args->GetString(0, &type))
     return;
   if (!token_service_)
     token_service_.reset(new AccessTokenService(this));
   token_service_->RequestToken(type);
 }
 
-void PrintPreviewHandler::PrintWithCloudPrintDialog(
-    const base::RefCountedBytes* data,
-    const string16& title) {
+void PrintPreviewHandler::PrintWithCloudPrintDialog() {
   // Record the number of times the user asks to print via cloud print
   // instead of the print preview dialog.
   ReportStats();
 
+  scoped_refptr<base::RefCountedBytes> data;
+  string16 title;
+  if (!GetPreviewDataAndTitle(&data, &title)) {
+    // Nothing to print, no preview available.
+    return;
+  }
+
   gfx::NativeWindow modal_parent = platform_util::GetTopLevel(
       preview_web_contents()->GetView()->GetNativeView());
   print_dialog_cloud::CreatePrintDialogForBytes(
       preview_web_contents()->GetBrowserContext(),
       modal_parent,
       data,
       title,
       string16(),
       std::string("application/pdf"));
 
@@ skipping 34 matching lines @@
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
       web_ui()->GetController());
   print_preview_ui->OnCancelPendingPreviewRequest();
 }
 
 void PrintPreviewHandler::HandleManagePrinters(const ListValue* /*args*/) {
   ++manage_printers_dialog_request_count_;
   printing::PrinterManagerDialog::ShowPrinterManagerDialog();
 }
 
-void PrintPreviewHandler::HandlePrintWithCloudPrint(
-    const base::ListValue* /*args*/) {
-  scoped_refptr<base::RefCountedBytes> data;
-  string16 title;
-  if (!GetPreviewDataAndTitle(&data, &title)) {
-    // Nothing to print, no preview available.
+void PrintPreviewHandler::HandlePrintWithCloudPrintDialog(
+    const base::ListValue* args) {
+  int page_count = 0;
+  if (!args || !args->GetInteger(0, &page_count))
     return;
-  }
-  PrintWithCloudPrintDialog(data, title);
+  UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.PrintToCloudPrintWebDialog",
+                       page_count);
+
+  PrintWithCloudPrintDialog();
 }
 
 void PrintPreviewHandler::HandleClosePreviewDialog(const ListValue* /*args*/) {
   ReportStats();
   ReportUserActionHistogram(CANCEL);
 
   // Record the number of times the user requests to regenerate preview data
   // before cancelling.
   UMA_HISTOGRAM_COUNTS("PrintPreview.RegeneratePreviewRequest.BeforeCancel",
                        regenerate_preview_request_count_);
@@ skipping 303 matching lines @@
     // Nothing to print, no preview available.
     return false;
   }
   DCHECK(tmp_data->size() && tmp_data->front());
 
   *data = tmp_data;
   *title = print_preview_ui->initiator_tab_title();
   return true;
 }