Print Preview: Change print to cr.sendWithPromise

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_HANDLER_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 230 matching lines @@
                         std::unique_ptr<base::DictionaryValue> settings_info);
 
   // Send the list of printers to the Web UI.
   void SetupPrinterList(const std::string& callback_id,
                         const printing::PrinterList& printer_list);
 
   // Send whether cloud print integration should be enabled.
   void SendCloudPrintEnabled();
 
   // Send the PDF data to the cloud to print.
-  void SendCloudPrintJob(const base::RefCountedBytes* data);
+  void SendCloudPrintJob(const std::string& callback_id,
+                         const base::RefCountedBytes* data);
 
   // Gets the initiator for the print preview dialog.
   content::WebContents* GetInitiator() const;
 
   // Closes the preview dialog.
   void ClosePreviewDialog();
 
   // Adds all the recorded stats taken so far to histogram counts.
   void ReportStats();
 
@@ skipping 23 matching lines @@
 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
   void StartPrivetLister(const scoped_refptr<
       local_discovery::ServiceDiscoverySharedClient>& client);
   void StopPrivetLister();
   void OnPrivetCapabilities(const std::string& callback_id,
                             const base::DictionaryValue* capabilities);
   void PrivetCapabilitiesUpdateClient(
       const std::string& callback_id,
       std::unique_ptr<cloud_print::PrivetHTTPClient> http_client);
   void PrivetLocalPrintUpdateClient(
+      const std::string& callback_id,
       std::string print_ticket,
       std::string capabilities,
       gfx::Size page_size,
       std::unique_ptr<cloud_print::PrivetHTTPClient> http_client);
   bool PrivetUpdateClient(
       const std::string& callback_id,
       std::unique_ptr<cloud_print::PrivetHTTPClient> http_client);
   void StartPrivetLocalPrint(const std::string& print_ticket,
                              const std::string& capabilities,
                              const gfx::Size& page_size);
   void SendPrivetCapabilitiesError(const std::string& id);
-  void PrintToPrivetPrinter(const std::string& printer_name,
+  void PrintToPrivetPrinter(const std::string& callback_id,
+                            const std::string& printer_name,
                             const std::string& print_ticket,
                             const std::string& capabilities,
                             const gfx::Size& page_size);
   bool CreatePrivetHTTP(
       const std::string& name,
       const cloud_print::PrivetHTTPAsynchronousFactory::ResultCallback&
           callback);
   void FillPrinterDescription(
       const std::string& name,
       const cloud_print::DeviceDescription& description,
@@ skipping 24 matching lines @@
 
   // Called when an extension reports the set of print capabilites for a
   // printer.
   // |callback_id|: The Javascript callback to reject or resolve
   // |capabilities|: The printer capabilities.
   void OnGotExtensionPrinterCapabilities(
       const std::string& callback_id,
       const base::DictionaryValue& capabilities);
 
   // Called when an extension print job is completed.
+  // |callback_id|: The javascript callback to run.
   // |success|: Whether the job succeeded.
   // |status|: The returned print job status. Useful for reporting a specific
   //     error.
-  void OnExtensionPrintResult(bool success, const std::string& status);
+  void OnExtensionPrintResult(const std::string& callback_id,
+                              bool success,
+                              const std::string& status);
 
   // Register/unregister from notifications of changes done to the GAIA
   // cookie.
   void RegisterForGaiaCookieChanges();
   void UnregisterForGaiaCookieChanges();
 
   // A count of how many requests received to regenerate preview data.
   // Initialized to 0 then incremented and emitted to a histogram.
   int regenerate_preview_request_count_;
 
@@ skipping 35 matching lines @@
 
   // Handles requests for extension printers. Created lazily by calling
   // |EnsureExtensionPrinterHandlerSet|.
   std::unique_ptr<PrinterHandler> extension_printer_handler_;
 
   // Notifies tests that want to know if the PDF has been saved. This doesn't
   // notify the test if it was a successful save, only that it was attempted.
   base::Closure pdf_file_saved_closure_;
 
   // Callback ID to be used to notify UI that privet search is finished.
-  std::string privet_callback_id_ = "";
+  std::string privet_search_callback_id_ = "";

[Lei Zhang, 2017/06/23 08:30:01]

You don't need to explicitly initialize std::string to "". It's not a Plain Old
Datatype.

[Lei Zhang, 2017/06/23 08:30:01]

Wrap with #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) ?

[rbpotter, 2017/06/23 17:34:30]

Done.

+
+  std::string privet_print_callback_id_ = "";

[Lei Zhang, 2017/06/23 08:30:01]

Might as well add comments for consistency.

[rbpotter, 2017/06/23 17:34:30]

Done.

+
+  std::string pdf_callback_id_ = "";
 
   // Proxy for calls to the print backend.  Lazily initialized since web_ui() is
   // not available at construction time.
   std::unique_ptr<printing::PrinterBackendProxy> printer_backend_proxy_;
 
   base::WeakPtrFactory<PrintPreviewHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_HANDLER_H_