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..33a2317ad48d2ff177b840144fdb6b7113982b05 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;
 }
 
@@ -132,13 +133,9 @@ 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 the number formatting and measurement system according
-  // to the current locale.
-  void HandleGetNumberFormatAndMeasurementSystem(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);
 
   // Sends the printer capabilities to the Web UI. |settings_info| contains
   // printer capabilities information.
@@ -179,6 +176,18 @@ 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_margin_type| and |last_used_custom_margins| according
+  // to the last used margin settings.
+  void GetLastUsedMarginSettings(
+      printing::MarginType* last_used_margin_type,
+      base::DictionaryValue* last_used_custom_margins);
+
   // Pointer to current print system.
   scoped_refptr<printing::PrintBackend> print_backend_;
 
@@ -190,6 +199,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.