Improves application state persistance.

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 110 matching lines @@
   UMA_HISTOGRAM_ENUMERATION("PrintPreview.PrintSettings", setting,
                             PRINT_SETTINGS_BUCKET_BOUNDARY);
 }
 
 void ReportPrintDestinationHistogram(enum PrintDestinationBuckets event) {
   UMA_HISTOGRAM_ENUMERATION("PrintPreview.DestinationAction", event,
                             PRINT_DESTINATION_BUCKET_BOUNDARY);
 }
 
 // Name of a dictionary field holding cloud print related data;
-const char kCloudPrintData[] = "cloudPrintData";
+const char kAppState[] = "appState";
 // Name of a dictionary field holding the initiator tab title.
 const char kInitiatorTabTitle[] = "initiatorTabTitle";
 // Name of a dictionary field holding the measurement system according to the
 // locale.
 const char kMeasurementSystem[] = "measurementSystem";
 // Name of a dictionary field holding the number format according to the locale.
 const char kNumberFormat[] = "numberFormat";
 // Name of a dictionary field specifying whether to print automatically in
 // kiosk mode. See http://crbug.com/31395.
 const char kPrintAutomaticallyInKioskMode[] = "printAutomaticallyInKioskMode";
@@ skipping 87 matching lines @@
   }
   // |metafile| must be deleted on the UI thread.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&base::DeletePointer<Metafile>, metafile));
 }
 #endif
 
 static base::LazyInstance<printing::StickySettings> sticky_settings =
     LAZY_INSTANCE_INITIALIZER;
-
 }  // namespace
 
 // static
 printing::StickySettings* PrintPreviewHandler::GetStickySettings() {
   return sticky_settings.Pointer();
 }
 
 PrintPreviewHandler::PrintPreviewHandler()
     : print_backend_(printing::PrintBackend::CreateInstance(NULL)),
       regenerate_preview_request_count_(0),
@@ skipping 36 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("closePrintPreviewTab",
       base::Bind(&PrintPreviewHandler::HandleClosePreviewTab,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("hidePreview",
       base::Bind(&PrintPreviewHandler::HandleHidePreview,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("cancelPendingPrintRequest",
       base::Bind(&PrintPreviewHandler::HandleCancelPendingPrintRequest,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("saveLastPrinter",
-      base::Bind(&PrintPreviewHandler::HandleSaveLastPrinter,
+  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("reportDestinationEvent",
       base::Bind(&PrintPreviewHandler::HandleReportDestinationEvent,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("printWithCloudPrint",
       base::Bind(&PrintPreviewHandler::HandlePrintWithCloudPrint,
                  base::Unretained(this)));
@@ skipping 102 matching lines @@
   TabContents* initiator_tab = GetInitiatorTab();
   if (initiator_tab) {
     RenderViewHost* rvh = initiator_tab->web_contents()->GetRenderViewHost();
     rvh->Send(new PrintMsg_ResetScriptedPrintCount(rvh->GetRoutingID()));
   }
 
   scoped_ptr<DictionaryValue> settings(GetSettingsDictionary(args));
   if (!settings.get())
     return;
 
-  // Storing last used settings.
-  printing::StickySettings* sticky_settings = GetStickySettings();
-  sticky_settings->Store(*settings);
-  sticky_settings->SaveInPrefs(Profile::FromBrowserContext(
-      preview_web_contents()->GetBrowserContext())->GetPrefs());
   // 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);
@@ skipping 89 matching lines @@
     const ListValue* /*args*/) {
   TabContents* initiator_tab = GetInitiatorTab();
   if (initiator_tab)
     ClearInitiatorTabDetails();
   gfx::NativeWindow parent = initiator_tab ?
       initiator_tab->web_contents()->GetView()->GetTopLevelNativeWindow() :
       NULL;
   chrome::ShowPrintErrorDialog(parent);
 }
 
-void PrintPreviewHandler::HandleSaveLastPrinter(const ListValue* args) {
+void PrintPreviewHandler::HandleSaveAppState(const ListValue* args) {
   std::string data_to_save;
+  printing::StickySettings* sticky_settings = GetStickySettings();
   if (args->GetString(0, &data_to_save) && !data_to_save.empty())
-    GetStickySettings()->StorePrinterName(data_to_save);
-
-  if (args->GetString(1, &data_to_save) && !data_to_save.empty())
-    GetStickySettings()->StoreCloudPrintData(data_to_save);
+    sticky_settings->StoreAppState(data_to_save);
+  sticky_settings->SaveInPrefs(Profile::FromBrowserContext(
+      preview_web_contents()->GetBrowserContext())->GetPrefs());
 }
 
 void PrintPreviewHandler::HandleGetPrinterCapabilities(const ListValue* args) {
   std::string printer_name;
   bool ret = args->GetString(0, &printer_name);
   if (!ret || printer_name.empty())
     return;
 
   scoped_refptr<PrintSystemTaskProxy> task =
       new PrintSystemTaskProxy(AsWeakPtr(),
@@ skipping 122 matching lines @@
   if (errorCode > U_ZERO_ERROR || system == UMS_LIMIT)
     system = UMS_SI;
 
   // Getting the number formatting based on the locale and writing to
   // dictionary.
   settings->SetString(kNumberFormat, base::FormatDouble(123456.78, 2));
   settings->SetInteger(kMeasurementSystem, system);
 }
 
 void PrintPreviewHandler::HandleGetInitialSettings(const ListValue* /*args*/) {
-  printing::StickySettings* sticky_settings = GetStickySettings();
-  sticky_settings->RestoreFromPrefs(Profile::FromBrowserContext(
-      preview_web_contents()->GetBrowserContext())->GetPrefs());
-  if (sticky_settings->printer_name()) {
-    std::string cloud_print_data;
-    if (sticky_settings->printer_cloud_print_data())
-      cloud_print_data = *sticky_settings->printer_cloud_print_data();
-    SendInitialSettings(*sticky_settings->printer_name(), cloud_print_data);
-  } else {
-    scoped_refptr<PrintSystemTaskProxy> task =
-        new PrintSystemTaskProxy(AsWeakPtr(),
-                                 print_backend_.get(),
-                                 has_logged_printers_count_);
-    BrowserThread::PostTask(
-        BrowserThread::FILE, FROM_HERE,
-        base::Bind(&PrintSystemTaskProxy::GetDefaultPrinter, task.get()));
-  }
+  scoped_refptr<PrintSystemTaskProxy> task =
+      new PrintSystemTaskProxy(AsWeakPtr(),
+                                print_backend_.get(),
+                                has_logged_printers_count_);
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+      base::Bind(&PrintSystemTaskProxy::GetDefaultPrinter, task.get()));
   SendCloudPrintEnabled();
 }
 
 void PrintPreviewHandler::HandleReportDestinationEvent(const ListValue* args) {
   int event_number;
   bool ret = args->GetInteger(0, &event_number);
   if (!ret)
     return;
   enum PrintDestinationBuckets event =
       static_cast<enum PrintDestinationBuckets>(event_number);
   if (event >= PRINT_DESTINATION_BUCKET_BOUNDARY)
     return;
   ReportPrintDestinationHistogram(event);
 }
 
 void PrintPreviewHandler::SendInitialSettings(
     const std::string& default_printer,
     const std::string& cloud_print_data) {
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
       web_ui()->GetController());
 
   base::DictionaryValue initial_settings;
   initial_settings.SetString(kInitiatorTabTitle,
                              print_preview_ui->initiator_tab_title());
   initial_settings.SetBoolean(printing::kSettingPreviewModifiable,
                               print_preview_ui->source_is_modifiable());
   initial_settings.SetString(printing::kSettingPrinterName,
                              default_printer);
-  initial_settings.SetString(kCloudPrintData, cloud_print_data);
-  initial_settings.SetBoolean(printing::kSettingHeaderFooterEnabled,
-                              GetStickySettings()->headers_footers());
-  initial_settings.SetInteger(printing::kSettingDuplexMode,
-                              GetStickySettings()->duplex_mode());
-
+  printing::StickySettings* sticky_settings = GetStickySettings();
+  sticky_settings->RestoreFromPrefs(Profile::FromBrowserContext(
+      preview_web_contents()->GetBrowserContext())->GetPrefs());
+  if (sticky_settings->printer_app_state())
+    initial_settings.SetString(kAppState,
+                               *sticky_settings->printer_app_state());
 
 #if defined(OS_MACOSX)
   bool kiosk_mode = false;  // No kiosk mode on Mac yet.
 #else
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
   bool kiosk_mode = (cmdline->HasSwitch(switches::kKioskMode) &&
                      cmdline->HasSwitch(switches::kKioskModePrinting));
 #endif
   initial_settings.SetBoolean(kPrintAutomaticallyInKioskMode, kiosk_mode);
 
   if (print_preview_ui->source_is_modifiable()) {
-    GetStickySettings()->GetLastUsedMarginSettings(&initial_settings);
     GetNumberFormatAndMeasurementSystem(&initial_settings);
   }
   web_ui()->CallJavascriptFunction("setInitialSettings", initial_settings);
 }
 
 void PrintPreviewHandler::ActivateInitiatorTabAndClosePreviewTab() {
   TabContents* initiator_tab = GetInitiatorTab();
   if (initiator_tab) {
     WebContents* web_contents = initiator_tab->web_contents();
     web_contents->GetDelegate()->ActivateContents(web_contents);
@@ skipping 104 matching lines @@
 void PrintPreviewHandler::OnPrintDialogShown() {
   ActivateInitiatorTabAndClosePreviewTab();
 }
 
 void PrintPreviewHandler::SelectFile(const FilePath& default_filename) {
   ui::SelectFileDialog::FileTypeInfo file_type_info;
   file_type_info.extensions.resize(1);
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("pdf"));
 
   // Initializing save_path_ if it is not already initialized.
-  if (!GetStickySettings()->save_path()) {
+  printing::StickySettings* sticky_settings = GetStickySettings();
+  if (!sticky_settings->save_path()) {
     // Allowing IO operation temporarily. It is ok to do so here because
     // the select file dialog performs IO anyway in order to display the
     // folders and also it is modal.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     FilePath file_path;
     PathService::Get(chrome::DIR_USER_DOCUMENTS, &file_path);
-    GetStickySettings()->StoreSavePath(file_path);
+    sticky_settings->StoreSavePath(file_path);
+    sticky_settings->SaveInPrefs(Profile::FromBrowserContext(
+        preview_web_contents()->GetBrowserContext())->GetPrefs());
   }
 
   select_file_dialog_ = ui::SelectFileDialog::Create(
       this, new ChromeSelectFilePolicy(preview_web_contents())),
   select_file_dialog_->SelectFile(
       ui::SelectFileDialog::SELECT_SAVEAS_FILE,
       string16(),
       GetStickySettings()->save_path()->Append(default_filename),
       &file_type_info,
       0,
@@ skipping 72 matching lines @@
     return;
 
   // We no longer require the initiator tab details. Remove those details
   // associated with the preview tab to allow the initiator tab to create
   // another preview tab.
   printing::PrintPreviewTabController* tab_controller =
       printing::PrintPreviewTabController::GetInstance();
   if (tab_controller)
     tab_controller->EraseInitiatorTabInfo(preview_tab_contents());
 }