Changed cloud print private API to pass all page settings as single object.

chrome/service/cloud_print/cloud_print_connector.h

 // 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.
 
 #ifndef CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_CONNECTOR_H_
 #define CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_CONNECTOR_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 50 matching lines @@
           DictionaryValue* json_data,
           bool succeeded);
 
   enum PendingTaskType {
     PENDING_PRINTERS_NONE,
     PENDING_PRINTERS_AVAILABLE,
     PENDING_PRINTER_REGISTER,
     PENDING_PRINTER_DELETE
   };
 
-  // TODO(jhawkins): This name conflicts with base::PendingTask.
+  // TODO(vitalybuka): Consider delete pending_tasks_ and just use MessageLoop.
   struct PendingTask {
     PendingTaskType type;
     // Optional members, depending on type.
     std::string printer_id;  // For pending delete.
+    std::string display_name;  // For pending register.
     printing::PrinterBasicInfo printer_info;  // For pending registration.
 
     PendingTask() : type(PENDING_PRINTERS_NONE) {}
     ~PendingTask() {}
   };
 
   virtual ~CloudPrintConnector();
   // PrintServerWatcherDelegate implementation
   virtual void OnPrinterAdded() OVERRIDE;
   // PrinterJobHandler::Delegate implementation
@@ skipping 47 matching lines @@
   void ReportUserMessage(const std::string& message_id,
                          const std::string& failure_message);
 
   bool RemovePrinterFromList(const std::string& printer_name,
                              printing::PrinterList* printer_list);
 
   void InitJobHandlerForPrinter(DictionaryValue* printer_data);
 
   void AddPendingAvailableTask();
   void AddPendingDeleteTask(const std::string& id);
-  void AddPendingRegisterTask(const printing::PrinterBasicInfo& info);
+  void AddPendingRegisterTask(const printing::PrinterBasicInfo& info,
+                              const std::string& display_name);
   void AddPendingTask(const PendingTask& task);
   void ProcessPendingTask();
   void ContinuePendingTaskProcessing();
   void OnPrintersAvailable();
-  void OnPrinterRegister(const printing::PrinterBasicInfo& info);
+  void OnPrinterRegister(const printing::PrinterBasicInfo& info,
+                         const std::string& display_name);
   void OnPrinterDelete(const std::string& name);
 
   void OnReceivePrinterCaps(
+      const std::string& display_name,
       bool succeeded,
       const std::string& printer_name,
       const printing::PrinterCapsAndDefaults& caps_and_defaults);
 
   // Register printer from the list.
   void RegisterPrinters(const printing::PrinterList& printers);
 
   bool IsSamePrinter(const std::string& name1, const std::string& name2) const;
   bool InitPrintSystem();
 
@@ skipping 19 matching lines @@
   // The CloudPrintURLFetcher instance for the user message request.
   scoped_refptr<CloudPrintURLFetcher> user_message_request_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPrintConnector);
 };
 
 }  // namespace cloud_print
 
 #endif  // CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_CONNECTOR_H_