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

chrome/browser/printing/print_system_task_proxy.cc

 // Copyright (c) 2011 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/printing/print_system_task_proxy.h"
 
 #include <ctype.h>
 
 #include <string>
 #include <vector>
@@ skipping 298 matching lines @@
     : handler_(handler),
       print_backend_(print_backend),
       has_logged_printers_count_(has_logged_printers_count) {
 }
 
 PrintSystemTaskProxy::~PrintSystemTaskProxy() {
 }
 
 void PrintSystemTaskProxy::GetDefaultPrinter() {
   VLOG(1) << "Get default printer start";
-  std::string* default_printer = NULL;
+  StringValue* default_printer = NULL;
   if (PrintPreviewHandler::last_used_printer_name_ == NULL) {
-    default_printer = new std::string(print_backend_->GetDefaultPrinterName());
+    default_printer = new StringValue(
+        print_backend_->GetDefaultPrinterName());
   } else {
-    default_printer = new std::string(
+    default_printer = new StringValue(
         *PrintPreviewHandler::last_used_printer_name_);
   }
+  std::string default_printer_string;
+  default_printer->GetAsString(&default_printer_string);
   VLOG(1) << "Get default printer finished, found: "
-          << default_printer;
+          << default_printer_string;
 
-  std::string* cloud_print_data = NULL;
+  StringValue* cloud_print_data = NULL;
   if (PrintPreviewHandler::last_used_printer_cloud_print_data_ != NULL) {
-    cloud_print_data = new std::string(
+    cloud_print_data = new StringValue(
         *PrintPreviewHandler::last_used_printer_cloud_print_data_);
   } else {
-    cloud_print_data = new std::string;
+    cloud_print_data = new StringValue("");
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&PrintSystemTaskProxy::SendDefaultPrinter, this,
                  default_printer, cloud_print_data));
 }
 
 void PrintSystemTaskProxy::SendDefaultPrinter(
-    const std::string* default_printer, const std::string* cloud_print_data) {
+    const StringValue* default_printer, const StringValue* cloud_print_data) {
   if (handler_)
-    handler_->SendInitialSettings(*default_printer, *cloud_print_data);
+    handler_->SendDefaultPrinter(*default_printer, *cloud_print_data);
   delete default_printer;
 }
 
 void PrintSystemTaskProxy::EnumeratePrinters() {
   VLOG(1) << "Enumerate printers start";
   ListValue* printers = new ListValue;
   printing::PrinterList printer_list;
   print_backend_->EnumeratePrinters(&printer_list);
 
   if (!has_logged_printers_count_) {
@@ skipping 178 matching lines @@
       base::Bind(&PrintSystemTaskProxy::SendPrinterCapabilities, this,
                  settings_info.DeepCopy()));
 }
 
 void PrintSystemTaskProxy::SendPrinterCapabilities(
     DictionaryValue* settings_info) {
   if (handler_)
     handler_->SendPrinterCapabilities(*settings_info);
   delete settings_info;
 }