Print Preview: Making margin selection sticky (part 2/2)

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 244ab896ef28beb3c03f0a54447a9c5a4914672c..97cd3b81ce97c57a46f14d881761d3c5e324966e 100644
--- a/chrome/browser/ui/webui/print_preview_handler.h
+++ b/chrome/browser/ui/webui/print_preview_handler.h
@@ -28,6 +28,7 @@ class StringValue;
 }
 
 namespace printing {
+struct PageSizeMargins;
 class PrintBackend;
 }
 
@@ -73,9 +74,6 @@ class PrintPreviewHandler : public WebUIMessageHandler,
   TabContentsWrapper* preview_tab_wrapper() const;
   TabContents* preview_tab() const;
 
-  // Gets the default printer. |args| is unused.
-  void HandleGetDefaultPrinter(const base::ListValue* args);
-
   // Gets the list of printers. |args| is unused.
   void HandleGetPrinters(const base::ListValue* args);
 
@@ -132,22 +130,18 @@ class PrintPreviewHandler : public WebUIMessageHandler,
   // Asks the browser to close the preview tab. |args| is unused.
   void HandleClosePreviewTab(const base::ListValue* args);
 
-  // Asks the browser for the title of the initiator tab.
-  // |args| is unused.
-  void HandleGetInitiatorTabTitle(const base::ListValue* args);
+  // Asks the browser for several settings that are needed before the first
+  // preview is displayed.
+  void HandleGetInitialSettings(const base::ListValue* args);
 
-  // Asks the browser for the number formatting and measurement system according
-  // to the current locale.
-  void HandleGetNumberFormatAndMeasurementSystem(const base::ListValue* args);
+  void SendInitialSettings(
+      const std::string& default_printer,
+      const std::string& cloud_print_data);
 
   // Sends the printer capabilities to the Web UI. |settings_info| contains
   // printer capabilities information.
   void SendPrinterCapabilities(const base::DictionaryValue& settings_info);
 
-  // Sends the default printer to the Web UI.
-  void SendDefaultPrinter(const base::StringValue& default_printer,
-                          const base::StringValue& cloud_print_data);
-
   // Send the list of printers to the Web UI.
   void SetupPrinterList(const base::ListValue& printers);
 
@@ -179,6 +173,17 @@ class PrintPreviewHandler : public WebUIMessageHandler,
   // Posts a task to save to pdf at |print_to_pdf_path_|.
   void PostPrintToPdfTask();
 
+  // Populates |number_format| and |measurement_system| according to the
+  // current locale.
+  void GetNumberFormatAndMeasurementSystem(string16* number_format,
+                                           int* measurement_system);
+
+
+  // Populates |last_used_custom_margins| according to the last used margin
+  // settings.
+  void GetLastUsedMarginSettings(
+      base::DictionaryValue* last_used_custom_margins);
+
   // Pointer to current print system.
   scoped_refptr<printing::PrintBackend> print_backend_;
 
@@ -190,6 +195,7 @@ class PrintPreviewHandler : public WebUIMessageHandler,
   static std::string* last_used_printer_name_;
   static printing::ColorModels last_used_color_model_;
   static printing::MarginType last_used_margins_type_;
+  static printing::PageSizeMargins* last_used_page_size_margins_;
 
   // A count of how many requests received to regenerate preview data.
   // Initialized to 0 then incremented and emitted to a histogram.