Print Preview: Handle a crashed initiator tab by showing a message in PP.

chrome/browser/ui/webui/print_preview_handler.h

Index: chrome/browser/ui/webui/print_preview_handler.h
diff --git a/chrome/browser/ui/webui/print_preview_handler.h b/chrome/browser/ui/webui/print_preview_handler.h
index 1a354e48cc7cd13fd19890af55abffdf2391f99e..8e51fd92b34cdfb13327244f0ecee60b294917d4 100644
--- a/chrome/browser/ui/webui/print_preview_handler.h
+++ b/chrome/browser/ui/webui/print_preview_handler.h
@@ -60,26 +60,24 @@ class PrintPreviewHandler : public WebUIMessageHandler,
 
   TabContents* preview_tab();
 
-  // Get the default printer. |args| is unused.
+  // Gets the default printer. |args| is unused.

[Lei Zhang, 2011/08/09 20:51:19]

Can you put all these comment changes into a separate cleanup CL?

[kmadhusu, 2011/08/10 16:46:59]

Done.

   void HandleGetDefaultPrinter(const base::ListValue* args);
 
-  // Get the list of printers. |args| is unused.
+  // Gets the list of printers. |args| is unused.
   void HandleGetPrinters(const base::ListValue* args);
 
-  // Ask the initiator renderer to generate a preview.
-  // First element of |args| is a job settings JSON string.
+  // Asks the initiator renderer to generate a preview.  First element of |args|
+  // is a job settings JSON string.
   void HandleGetPreview(const base::ListValue* args);
 
-  // Get the job settings from Web UI and initiate printing.
-  // First element of |args| is a job settings JSON string.
+  // Gets the job settings from Web UI and initiate printing.  First element of
+  // |args| is a job settings JSON string.
   void HandlePrint(const base::ListValue* args);
 
-  // Handles the request to hide the preview tab for printing.
-  // |args| is unused.
+  // Handles the request to hide the preview tab for printing. |args| is unused.
   void HandleHidePreview(const base::ListValue* args);
 
-  // Handles the request to cancel the pending print request.
-  // |args| is unused.
+  // Handles the request to cancel the pending print request. |args| is unused.
   void HandleCancelPendingPrintRequest(const base::ListValue* args);
 
   // Handles a request to back up data about the last used cloud print
@@ -88,31 +86,32 @@ class PrintPreviewHandler : public WebUIMessageHandler,
   // Second element of |args| is the current cloud print data JSON.
   void HandleSaveLastPrinter(const base::ListValue* args);
 
-  // Get the printer capabilities.
-  // First element of |args| is the printer name.
+  // Gets the printer capabilities. First element of |args| is the printer name.
   void HandleGetPrinterCapabilities(const base::ListValue* args);
 
-  // Ask the initiator renderer to show the native print system dialog.
-  // |args| is unused.
+  // Asks the initiator renderer to show the native print system dialog. |args|
+  // is unused.
   void HandleShowSystemDialog(const base::ListValue* args);
 
-  // Bring up a web page to allow the user to configure cloud print.
+  // Brings up a web page to allow the user to configure cloud print.
   // |args| is unused.
   void HandleManageCloudPrint(const base::ListValue* args);
 
-  // Ask the browser to show the native printer management dialog.
+  // Asks the browser to show the native printer management dialog.
   // |args| is unused.
   void HandleManagePrinters(const base::ListValue* args);
 
-  // Ask the browser to close the preview tab.
-  // |args| is unused.
+  // Reloads the initiator tab and closes the associated preview tab.
+  void HandleReloadCrashedInitiatorTab(const base::ListValue* args);
+
+  // Asks the browser to close the preview tab. |args| is unused.
   void HandleClosePreviewTab(const base::ListValue* args);
 
-  // Send the printer capabilities to the Web UI.
-  // |settings_info| contains printer capabilities information.
+  // Sends the printer capabilities to the Web UI. |settings_info| contains
+  // printer capabilities information.
   void SendPrinterCapabilities(const base::DictionaryValue& settings_info);
 
-  // Send the default printer to the Web UI.
+  // Sends the default printer to the Web UI.
   void SendDefaultPrinter(const base::StringValue& default_printer,
                           const base::StringValue& cloud_print_data);
 
@@ -126,22 +125,25 @@ class PrintPreviewHandler : public WebUIMessageHandler,
   void SendCloudPrintJob(const base::DictionaryValue& settings,
                          std::string print_ticket);
 
-  // Helper function to get the initiator tab for the print preview tab.
+  // Sends the list of printers to the Web UI.
+  void SendPrinterList(const base::ListValue& printers);

[Lei Zhang, 2011/08/09 20:51:19]

Bad merge?

[kmadhusu, 2011/08/10 16:46:59]

my bad.. fixed.

+
+  // Gets the initiator tab for the print preview tab.
   TabContents* GetInitiatorTab();
 
-  // Helper function to close the print preview tab.
+  // Closes the print preview tab.
   void ClosePrintPreviewTab();
 
-  // Helper function to activate the initiator tab and close the preview tab.
+  // Activates the initiator tab and close the preview tab.
   void ActivateInitiatorTabAndClosePreviewTab();
 
   // Adds all the recorded stats taken so far to histogram counts.
   void ReportStats();
 
-  // Helper function to hide the preview tab for printing.
+  // Hides the preview tab for printing.
   void HidePreviewTab();
 
-  // Helper function to clear initiator tab details for this preview tab.
+  // Clears initiator tab details for this preview tab.
   void ClearInitiatorTabDetails();
 
   // Pointer to current print system.