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

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

Issue 3945003: Move useful printing backend code from chrome/service/cloud_print to printing... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: resolve merge conflict Created 10 years, 2 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
« no previous file with comments | « chrome/service/cloud_print/print_system_win.cc ('k') | chrome/service/cloud_print/printer_job_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/cloud_print/printer_job_handler.h
===================================================================
--- chrome/service/cloud_print/printer_job_handler.h (revision 63553)
+++ chrome/service/cloud_print/printer_job_handler.h (working copy)
@@ -14,10 +14,10 @@
#include "base/message_loop_proxy.h"
#include "base/thread.h"
#include "chrome/service/cloud_print/job_status_updater.h"
-#include "chrome/service/cloud_print/print_system.h"
#include "chrome/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "net/url_request/url_request_status.h"
+#include "printing/backend/print_backend.h"
// A class that handles cloud print jobs for a particular printer. This class
// imlements a state machine that transitions from Start to various states. The
@@ -104,7 +104,7 @@
};
// Begin public interface
- PrinterJobHandler(const cloud_print::PrinterBasicInfo& printer_info,
+ PrinterJobHandler(const printing::PrinterBasicInfo& printer_info,
const PrinterInfoFromCloud& printer_info_from_server,
const std::string& auth_token,
const GURL& cloud_print_server_url,
@@ -232,7 +232,7 @@
scoped_ptr<URLFetcher> request_;
scoped_refptr<cloud_print::PrintSystem> print_system_;
- cloud_print::PrinterBasicInfo printer_info_;
+ printing::PrinterBasicInfo printer_info_;
PrinterInfoFromCloud printer_info_cloud_;
std::string auth_token_;
GURL cloud_print_server_url_;
@@ -280,4 +280,3 @@
typedef PrinterJobHandler::Delegate PrinterJobHandlerDelegate;
#endif // CHROME_SERVICE_CLOUD_PRINT_PRINTER_JOB_HANDLER_H_
-
« no previous file with comments | « chrome/service/cloud_print/print_system_win.cc ('k') | chrome/service/cloud_print/printer_job_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698