Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4009)

Unified Diff: chrome/service/cloud_print/cloud_print_connector.h

Issue 14215009: Changed cloud print private API to pass all page settings as single object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed warning and unittes Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698