Index: chrome/service/cloud_print/cloud_print_connector.h |
diff --git a/chrome/service/cloud_print/cloud_print_connector.h b/chrome/service/cloud_print/cloud_print_connector.h |
index ee80650fd9f6a7f1c1afc93ddf42e20864db6f86..88177285e2f182df71f0f66804477b4b025793eb 100644 |
--- a/chrome/service/cloud_print/cloud_print_connector.h |
+++ b/chrome/service/cloud_print/cloud_print_connector.h |
@@ -68,15 +68,16 @@ class CloudPrintConnector |
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() {} |
+ PendingTask(); |
+ ~PendingTask(); |
}; |
virtual ~CloudPrintConnector(); |
@@ -140,15 +141,18 @@ class CloudPrintConnector |
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); |