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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: printing/backend/print_backend_win.cc

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 | « printing/backend/print_backend_dummy.cc ('k') | printing/backend/win_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/backend/print_backend_win.cc
===================================================================
--- printing/backend/print_backend_win.cc (revision 0)
+++ printing/backend/print_backend_win.cc (working copy)
@@ -2,85 +2,29 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/service/cloud_print/print_system.h"
+#include "printing/backend/print_backend.h"
-#include <windows.h>
#include <objidl.h>
-#include <ocidl.h>
-#include <olectl.h>
#include <prntvpt.h>
#include <winspool.h>
-#include "base/lock.h"
-#include "base/file_util.h"
-#include "base/object_watcher.h"
#include "base/scoped_ptr.h"
+#include "base/string_piece.h"
#include "base/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_comptr.h"
-#include "chrome/service/cloud_print/cloud_print_consts.h"
-#include "chrome/service/service_process.h"
-#include "chrome/service/service_utility_process_host.h"
-#include "gfx/rect.h"
-#include "printing/native_metafile.h"
-#include "printing/page_range.h"
+#include "base/win/scoped_hglobal.h"
+#include "printing/backend/print_backend_consts.h"
+#include "printing/backend/win_helper.h"
#pragma comment(lib, "prntvpt.lib")
-#pragma comment(lib, "rpcrt4.lib")
using base::win::ScopedBstr;
using base::win::ScopedComPtr;
+using base::win::ScopedHGlobal;
namespace {
-class DevMode {
- public:
- DevMode() : dm_(NULL) {}
- ~DevMode() { Free(); }
-
- void Allocate(int size) {
- Free();
- dm_ = reinterpret_cast<DEVMODE*>(new char[size]);
- }
-
- void Free() {
- if (dm_)
- delete [] dm_;
- dm_ = NULL;
- }
-
- DEVMODE* dm_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DevMode);
-};
-
-bool InitXPSModule() {
- HMODULE prntvpt_module = LoadLibrary(L"prntvpt.dll");
- return (NULL != prntvpt_module);
-}
-
-inline HRESULT GetLastErrorHR() {
- LONG error = GetLastError();
- return HRESULT_FROM_WIN32(error);
-}
-
-HRESULT StreamFromPrintTicket(const std::string& print_ticket,
- IStream** stream) {
- DCHECK(stream);
- HRESULT hr = CreateStreamOnHGlobal(NULL, TRUE, stream);
- if (FAILED(hr)) {
- return hr;
- }
- ULONG bytes_written = 0;
- (*stream)->Write(print_ticket.c_str(), print_ticket.length(), &bytes_written);
- DCHECK(bytes_written == print_ticket.length());
- LARGE_INTEGER pos = {0};
- ULARGE_INTEGER new_pos = {0};
- (*stream)->Seek(pos, STREAM_SEEK_SET, &new_pos);
- return S_OK;
-}
-
HRESULT StreamOnHGlobalToString(IStream* stream, std::string* out) {
DCHECK(stream);
DCHECK(out);
@@ -94,442 +38,24 @@
return hr;
}
-HRESULT PrintTicketToDevMode(const std::string& printer_name,
- const std::string& print_ticket,
- DevMode* dev_mode) {
- DCHECK(dev_mode);
-
- ScopedComPtr<IStream> pt_stream;
- HRESULT hr = StreamFromPrintTicket(print_ticket, pt_stream.Receive());
- if (FAILED(hr))
- return hr;
-
- HPTPROVIDER provider = NULL;
- hr = PTOpenProvider(UTF8ToWide(printer_name).c_str(), 1, &provider);
- if (SUCCEEDED(hr)) {
- ULONG size = 0;
- DEVMODE* dm = NULL;
- hr = PTConvertPrintTicketToDevMode(provider,
- pt_stream,
- kUserDefaultDevmode,
- kPTDocumentScope,
- &size,
- &dm,
- NULL);
- if (SUCCEEDED(hr)) {
- dev_mode->Allocate(size);
- memcpy(dev_mode->dm_, dm, size);
- PTReleaseMemory(dm);
- }
- PTCloseProvider(provider);
- }
- return hr;
-}
-
} // namespace
-namespace cloud_print {
+namespace printing {
-class PrintSystemWatcherWin
- : public base::ObjectWatcher::Delegate {
+class PrintBackendWin : public PrintBackend {
public:
- PrintSystemWatcherWin()
- : printer_(NULL), printer_change_(NULL), delegate_(NULL) {
- }
- ~PrintSystemWatcherWin() {
- Stop();
- }
+ PrintBackendWin() {}
+ virtual ~PrintBackendWin() {}
- class Delegate {
- public:
- virtual void OnPrinterAdded() = 0;
- virtual void OnPrinterDeleted() = 0;
- virtual void OnPrinterChanged() = 0;
- virtual void OnJobChanged() = 0;
- };
-
- bool Start(const std::string& printer_name, Delegate* delegate) {
- delegate_ = delegate;
- // An empty printer name means watch the current server, we need to pass
- // NULL to OpenPrinter.
- LPTSTR printer_name_to_use = NULL;
- std::wstring printer_name_wide;
- if (!printer_name.empty()) {
- printer_name_wide = UTF8ToWide(printer_name);
- printer_name_to_use = const_cast<LPTSTR>(printer_name_wide.c_str());
- }
- bool ret = false;
- OpenPrinter(printer_name_to_use, &printer_, NULL);
- if (printer_) {
- printer_change_ = FindFirstPrinterChangeNotification(
- printer_, PRINTER_CHANGE_PRINTER|PRINTER_CHANGE_JOB, 0, NULL);
- if (printer_change_) {
- ret = watcher_.StartWatching(printer_change_, this);
- }
- }
- if (!ret) {
- Stop();
- }
- return ret;
- }
- bool Stop() {
- watcher_.StopWatching();
- if (printer_) {
- ClosePrinter(printer_);
- printer_ = NULL;
- }
- if (printer_change_) {
- FindClosePrinterChangeNotification(printer_change_);
- printer_change_ = NULL;
- }
- return true;
- }
-
- // base::ObjectWatcher::Delegate method
- virtual void OnObjectSignaled(HANDLE object) {
- DWORD change = 0;
- FindNextPrinterChangeNotification(object, &change, NULL, NULL);
-
- if (change != ((PRINTER_CHANGE_PRINTER|PRINTER_CHANGE_JOB) &
- (~PRINTER_CHANGE_FAILED_CONNECTION_PRINTER))) {
- // For printer connections, we get spurious change notifications with
- // all flags set except PRINTER_CHANGE_FAILED_CONNECTION_PRINTER.
- // Ignore these.
- if (change & PRINTER_CHANGE_ADD_PRINTER) {
- delegate_->OnPrinterAdded();
- } else if (change & PRINTER_CHANGE_DELETE_PRINTER) {
- delegate_->OnPrinterDeleted();
- } else if (change & PRINTER_CHANGE_SET_PRINTER) {
- delegate_->OnPrinterChanged();
- }
- if (change & PRINTER_CHANGE_JOB) {
- delegate_->OnJobChanged();
- }
- }
- watcher_.StartWatching(printer_change_, this);
- }
-
- bool GetCurrentPrinterInfo(PrinterBasicInfo* printer_info) {
- DCHECK(printer_info);
- if (!printer_)
- return false;
-
- DWORD bytes_needed = 0;
- bool ret = false;
- GetPrinter(printer_, 2, NULL, 0, &bytes_needed);
- if (0 != bytes_needed) {
- scoped_ptr<BYTE> printer_info_buffer(new BYTE[bytes_needed]);
- if (GetPrinter(printer_, 2, printer_info_buffer.get(),
- bytes_needed, &bytes_needed)) {
- PRINTER_INFO_2* printer_info_win =
- reinterpret_cast<PRINTER_INFO_2*>(printer_info_buffer.get());
- printer_info->printer_name = WideToUTF8(printer_info_win->pPrinterName);
- if (printer_info_win->pComment)
- printer_info->printer_description =
- WideToUTF8(printer_info_win->pComment);
- if (printer_info_win->pLocation)
- printer_info->options[kLocationTagName] =
- WideToUTF8(printer_info_win->pLocation);
- if (printer_info_win->pDriverName)
- printer_info->options[kDriverNameTagName] =
- WideToUTF8(printer_info_win->pDriverName);
- printer_info->printer_status = printer_info_win->Status;
- ret = true;
- }
- }
- return ret;
- }
-
- private:
- base::ObjectWatcher watcher_;
- HANDLE printer_; // The printer being watched
- HANDLE printer_change_; // Returned by FindFirstPrinterChangeNotifier
- Delegate* delegate_; // Delegate to notify
- bool did_signal_; // DoneWaiting was called
-};
-
-// This typedef is to workaround the issue with certain versions of
-// Visual Studio where it gets confused between multiple Delegate.
-// In this case, some compilers get confused and inherit
-// PrintSystemWin watchers from wrong Delegate, giving C2664 and C2259 errors.
-typedef PrintSystemWatcherWin::Delegate PrintSystemWatcherWinDelegate;
-
-class PrintSystemWin : public PrintSystem {
- public:
virtual void EnumeratePrinters(PrinterList* printer_list);
virtual bool GetPrinterCapsAndDefaults(const std::string& printer_name,
PrinterCapsAndDefaults* printer_info);
- virtual bool ValidatePrintTicket(const std::string& printer_name,
- const std::string& print_ticket_data);
-
- virtual bool GetJobDetails(const std::string& printer_name,
- PlatformJobId job_id,
- PrintJobDetails *job_details);
-
virtual bool IsValidPrinter(const std::string& printer_name);
-
- class PrintServerWatcherWin
- : public PrintSystem::PrintServerWatcher,
- public PrintSystemWatcherWinDelegate {
- public:
- PrintServerWatcherWin() {}
-
- // PrintSystem::PrintServerWatcher interface
- virtual bool StartWatching(
- PrintSystem::PrintServerWatcher::Delegate* delegate) {
- delegate_ = delegate;
- return watcher_.Start(std::string(), this);
- }
- virtual bool StopWatching() {
- bool ret = watcher_.Stop();
- delegate_ = NULL;
- return ret;
- }
-
- // PrintSystemWatcherWin::Delegate interface
- virtual void OnPrinterAdded() {
- delegate_->OnPrinterAdded();
- }
- virtual void OnPrinterDeleted() {
- }
- virtual void OnPrinterChanged() {
- }
- virtual void OnJobChanged() {
- }
-
- private:
- PrintSystem::PrintServerWatcher::Delegate* delegate_;
- PrintSystemWatcherWin watcher_;
- DISALLOW_COPY_AND_ASSIGN(PrintServerWatcherWin);
- };
-
- class PrinterWatcherWin
- : public PrintSystem::PrinterWatcher,
- public PrintSystemWatcherWinDelegate {
- public:
- explicit PrinterWatcherWin(const std::string& printer_name)
- : printer_name_(printer_name) {}
-
- // PrintSystem::PrinterWatcher interface
- virtual bool StartWatching(
- PrintSystem::PrinterWatcher::Delegate* delegate) {
- delegate_ = delegate;
- return watcher_.Start(printer_name_, this);
- }
- virtual bool StopWatching() {
- bool ret = watcher_.Stop();
- delegate_ = NULL;
- return ret;
- }
- virtual bool GetCurrentPrinterInfo(PrinterBasicInfo* printer_info) {
- return watcher_.GetCurrentPrinterInfo(printer_info);
- }
-
- // PrintSystemWatcherWin::Delegate interface
- virtual void OnPrinterAdded() {
- NOTREACHED();
- }
- virtual void OnPrinterDeleted() {
- delegate_->OnPrinterDeleted();
- }
- virtual void OnPrinterChanged() {
- delegate_->OnPrinterChanged();
- }
- virtual void OnJobChanged() {
- delegate_->OnJobChanged();
- }
-
- private:
- std::string printer_name_;
- PrintSystem::PrinterWatcher::Delegate* delegate_;
- PrintSystemWatcherWin watcher_;
- DISALLOW_COPY_AND_ASSIGN(PrinterWatcherWin);
- };
-
- class JobSpoolerWin : public PrintSystem::JobSpooler {
- public:
- JobSpoolerWin() : core_(new Core) {}
- // PrintSystem::JobSpooler implementation.
- virtual bool Spool(const std::string& print_ticket,
- const FilePath& print_data_file_path,
- const std::string& print_data_mime_type,
- const std::string& printer_name,
- const std::string& job_title,
- JobSpooler::Delegate* delegate) {
- return core_->Spool(print_ticket, print_data_file_path,
- print_data_mime_type, printer_name, job_title,
- delegate);
- }
- private:
- // We use a Core class because we want a separate RefCountedThreadSafe
- // implementation for ServiceUtilityProcessHost::Client.
- class Core : public ServiceUtilityProcessHost::Client {
- public:
- Core()
- : last_page_printed_(-1), job_id_(-1), delegate_(NULL), saved_dc_(0) {
- }
- ~Core() {
- }
- bool Spool(const std::string& print_ticket,
- const FilePath& print_data_file_path,
- const std::string& print_data_mime_type,
- const std::string& printer_name,
- const std::string& job_title,
- JobSpooler::Delegate* delegate) {
- if (delegate_) {
- // We are already in the process of printing.
- NOTREACHED();
- return false;
- }
- last_page_printed_ = -1;
- // We only support PDFs for now.
- if (print_data_mime_type != "application/pdf") {
- NOTREACHED();
- return false;
- }
-
- if (!InitXPSModule()) {
- // TODO(sanjeevr): Handle legacy proxy case (with no prntvpt.dll)
- return false;
- }
- DevMode pt_dev_mode;
- HRESULT hr = PrintTicketToDevMode(printer_name, print_ticket,
- &pt_dev_mode);
- if (FAILED(hr)) {
- NOTREACHED();
- return false;
- }
- HDC dc = CreateDC(L"WINSPOOL", UTF8ToWide(printer_name).c_str(),
- NULL, pt_dev_mode.dm_);
- if (!dc) {
- NOTREACHED();
- return false;
- }
- hr = E_FAIL;
- DOCINFO di = {0};
- di.cbSize = sizeof(DOCINFO);
- std::wstring doc_name = UTF8ToWide(job_title);
- di.lpszDocName = doc_name.c_str();
- job_id_ = StartDoc(dc, &di);
- if (job_id_ <= 0)
- return false;
-
- printer_dc_.Set(dc);
-
- int printer_dpi = ::GetDeviceCaps(printer_dc_.Get(), LOGPIXELSX);
- saved_dc_ = SaveDC(printer_dc_.Get());
- SetGraphicsMode(printer_dc_.Get(), GM_ADVANCED);
- XFORM xform = {0};
- xform.eM11 = xform.eM22 = static_cast<float>(printer_dpi) /
- static_cast<float>(GetDeviceCaps(GetDC(NULL), LOGPIXELSX));
- ModifyWorldTransform(printer_dc_.Get(), &xform, MWT_LEFTMULTIPLY);
- print_data_file_path_ = print_data_file_path;
- delegate_ = delegate;
- RenderNextPDFPages();
- return true;
- }
-
- // ServiceUtilityProcessHost::Client implementation.
- virtual void OnRenderPDFPagesToMetafileSucceeded(
- const printing::NativeMetafile& metafile,
- int highest_rendered_page_number) {
- metafile.SafePlayback(printer_dc_.Get());
- bool done_printing = (highest_rendered_page_number !=
- last_page_printed_ + kPageCountPerBatch);
- last_page_printed_ = highest_rendered_page_number;
- if (done_printing)
- PrintJobDone();
- else
- RenderNextPDFPages();
- }
- virtual void OnRenderPDFPagesToMetafileFailed() {
- PrintJobDone();
- }
- virtual void OnChildDied() {
- PrintJobDone();
- }
- private:
- void PrintJobDone() {
- // If there is no delegate, then there is nothing pending to process.
- if (!delegate_)
- return;
- RestoreDC(printer_dc_.Get(), saved_dc_);
- EndDoc(printer_dc_.Get());
- if (-1 == last_page_printed_) {
- delegate_->OnJobSpoolFailed();
- } else {
- delegate_->OnJobSpoolSucceeded(job_id_);
- }
- delegate_ = NULL;
- }
- void RenderNextPDFPages() {
- printing::PageRange range;
- // Render 10 pages at a time.
- range.from = last_page_printed_ + 1;
- range.to = last_page_printed_ + kPageCountPerBatch;
- std::vector<printing::PageRange> page_ranges;
- page_ranges.push_back(range);
-
- int printer_dpi = ::GetDeviceCaps(printer_dc_.Get(), LOGPIXELSX);
- int dc_width = GetDeviceCaps(printer_dc_.Get(), PHYSICALWIDTH);
- int dc_height = GetDeviceCaps(printer_dc_.Get(), PHYSICALHEIGHT);
- gfx::Rect render_area(0, 0, dc_width, dc_height);
- g_service_process->io_thread()->message_loop_proxy()->PostTask(
- FROM_HERE,
- NewRunnableMethod(
- this,
- &JobSpoolerWin::Core::RenderPDFPagesInSandbox,
- print_data_file_path_,
- render_area,
- printer_dpi,
- page_ranges,
- base::MessageLoopProxy::CreateForCurrentThread()));
- }
- // Called on the service process IO thread.
- void RenderPDFPagesInSandbox(
- const FilePath& pdf_path, const gfx::Rect& render_area,
- int render_dpi, const std::vector<printing::PageRange>& page_ranges,
- const scoped_refptr<base::MessageLoopProxy>&
- client_message_loop_proxy) {
- DCHECK(g_service_process->io_thread()->message_loop_proxy()->
- BelongsToCurrentThread());
- scoped_ptr<ServiceUtilityProcessHost> utility_host(
- new ServiceUtilityProcessHost(this, client_message_loop_proxy));
- if (utility_host->StartRenderPDFPagesToMetafile(pdf_path,
- render_area,
- render_dpi,
- page_ranges)) {
- // The object will self-destruct when the child process dies.
- utility_host.release();
- }
- }
- // Some Cairo-generated PDFs from Chrome OS result in huge metafiles.
- // So the PageCountPerBatch is set to 1 for now.
- // TODO(sanjeevr): Figure out a smarter way to determine the pages per
- // batch. Filed a bug to track this at
- // http://code.google.com/p/chromium/issues/detail?id=57350.
- static const int kPageCountPerBatch = 1;
- int last_page_printed_;
- PlatformJobId job_id_;
- PrintSystem::JobSpooler::Delegate* delegate_;
- int saved_dc_;
- ScopedHDC printer_dc_;
- FilePath print_data_file_path_;
- DISALLOW_COPY_AND_ASSIGN(JobSpoolerWin::Core);
- };
- scoped_refptr<Core> core_;
- DISALLOW_COPY_AND_ASSIGN(JobSpoolerWin);
- };
-
- virtual PrintSystem::PrintServerWatcher* CreatePrintServerWatcher();
- virtual PrintSystem::PrinterWatcher* CreatePrinterWatcher(
- const std::string& printer_name);
- virtual PrintSystem::JobSpooler* CreateJobSpooler();
};
-void PrintSystemWin::EnumeratePrinters(PrinterList* printer_list) {
+void PrintBackendWin::EnumeratePrinters(PrinterList* printer_list) {
DCHECK(printer_list);
DWORD bytes_needed = 0;
DWORD count_returned = 0;
@@ -560,10 +86,10 @@
}
}
-bool PrintSystemWin::GetPrinterCapsAndDefaults(
+bool PrintBackendWin::GetPrinterCapsAndDefaults(
const std::string& printer_name,
PrinterCapsAndDefaults* printer_info) {
- if (!InitXPSModule()) {
+ if (!printing::InitXPSModule()) {
// TODO(sanjeevr): Handle legacy proxy case (with no prntvpt.dll)
return false;
}
@@ -602,7 +128,7 @@
DWORD devmode_size = DocumentProperties(
NULL, printer_handle, const_cast<LPTSTR>(printer_name_wide.c_str()),
NULL, NULL, 0);
- DCHECK(0 != devmode_size);
+ DCHECK_NE(0U, devmode_size);
scoped_ptr<BYTE> devmode_out_buffer(new BYTE[devmode_size]);
DEVMODE* devmode_out =
reinterpret_cast<DEVMODE*>(devmode_out_buffer.get());
@@ -632,88 +158,8 @@
return true;
}
-bool PrintSystemWin::ValidatePrintTicket(
- const std::string& printer_name,
- const std::string& print_ticket_data) {
- if (!InitXPSModule()) {
- // TODO(sanjeevr): Handle legacy proxy case (with no prntvpt.dll)
- return false;
- }
- bool ret = false;
- HPTPROVIDER provider = NULL;
- PTOpenProvider(UTF8ToWide(printer_name.c_str()).c_str(), 1, &provider);
- if (provider) {
- ScopedComPtr<IStream> print_ticket_stream;
- CreateStreamOnHGlobal(NULL, TRUE, print_ticket_stream.Receive());
- ULONG bytes_written = 0;
- print_ticket_stream->Write(print_ticket_data.c_str(),
- print_ticket_data.length(),
- &bytes_written);
- DCHECK(bytes_written == print_ticket_data.length());
- LARGE_INTEGER pos = {0};
- ULARGE_INTEGER new_pos = {0};
- print_ticket_stream->Seek(pos, STREAM_SEEK_SET, &new_pos);
- ScopedBstr error;
- ScopedComPtr<IStream> result_ticket_stream;
- CreateStreamOnHGlobal(NULL, TRUE, result_ticket_stream.Receive());
- ret = SUCCEEDED(PTMergeAndValidatePrintTicket(provider,
- print_ticket_stream.get(),
- NULL,
- kPTJobScope,
- result_ticket_stream.get(),
- error.Receive()));
- PTCloseProvider(provider);
- }
- return ret;
-}
-
-bool PrintSystemWin::GetJobDetails(const std::string& printer_name,
- PlatformJobId job_id,
- PrintJobDetails *job_details) {
- DCHECK(job_details);
- HANDLE printer_handle = NULL;
+bool PrintBackendWin::IsValidPrinter(const std::string& printer_name) {
std::wstring printer_name_wide = UTF8ToWide(printer_name);
- OpenPrinter(const_cast<LPTSTR>(printer_name_wide.c_str()), &printer_handle,
- NULL);
- DCHECK(printer_handle);
- bool ret = false;
- if (printer_handle) {
- DWORD bytes_needed = 0;
- GetJob(printer_handle, job_id, 1, NULL, 0, &bytes_needed);
- DWORD last_error = GetLastError();
- if (ERROR_INVALID_PARAMETER != last_error) {
- // ERROR_INVALID_PARAMETER normally means that the job id is not valid.
- DCHECK(last_error == ERROR_INSUFFICIENT_BUFFER);
- scoped_ptr<BYTE> job_info_buffer(new BYTE[bytes_needed]);
- if (GetJob(printer_handle, job_id, 1, job_info_buffer.get(), bytes_needed,
- &bytes_needed)) {
- JOB_INFO_1 *job_info =
- reinterpret_cast<JOB_INFO_1 *>(job_info_buffer.get());
- if (job_info->pStatus) {
- WideToUTF8(job_info->pStatus, wcslen(job_info->pStatus),
- &job_details->status_message);
- }
- job_details->platform_status_flags = job_info->Status;
- if ((job_info->Status & JOB_STATUS_COMPLETE) ||
- (job_info->Status & JOB_STATUS_PRINTED)) {
- job_details->status = PRINT_JOB_STATUS_COMPLETED;
- } else if (job_info->Status & JOB_STATUS_ERROR) {
- job_details->status = PRINT_JOB_STATUS_ERROR;
- } else {
- job_details->status = PRINT_JOB_STATUS_IN_PROGRESS;
- }
- job_details->total_pages = job_info->TotalPages;
- job_details->pages_printed = job_info->PagesPrinted;
- ret = true;
- }
- }
- ClosePrinter(printer_handle);
- }
- return ret;
-}
-
-bool PrintSystemWin::IsValidPrinter(const std::string& printer_name) {
- std::wstring printer_name_wide = UTF8ToWide(printer_name);
HANDLE printer_handle = NULL;
OpenPrinter(const_cast<LPTSTR>(printer_name_wide.c_str()), &printer_handle,
NULL);
@@ -725,39 +171,9 @@
return ret;
}
-PrintSystem::PrintServerWatcher*
-PrintSystemWin::CreatePrintServerWatcher() {
- return new PrintServerWatcherWin();
+scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
+ const DictionaryValue* print_backend_settings) {
+ return new PrintBackendWin;
}
-PrintSystem::PrinterWatcher* PrintSystemWin::CreatePrinterWatcher(
- const std::string& printer_name) {
- DCHECK(!printer_name.empty());
- return new PrinterWatcherWin(printer_name);
-}
-
-PrintSystem::JobSpooler*
-PrintSystemWin::CreateJobSpooler() {
- return new JobSpoolerWin();
-}
-
-std::string PrintSystem::GenerateProxyId() {
- GUID proxy_id = {0};
- HRESULT hr = UuidCreate(&proxy_id);
- DCHECK(SUCCEEDED(hr));
- wchar_t* proxy_id_as_string = NULL;
- UuidToString(&proxy_id, reinterpret_cast<RPC_WSTR *>(&proxy_id_as_string));
- DCHECK(proxy_id_as_string);
- std::string ret;
- WideToUTF8(proxy_id_as_string, wcslen(proxy_id_as_string), &ret);
- RpcStringFree(reinterpret_cast<RPC_WSTR *>(&proxy_id_as_string));
- return ret;
-}
-
-scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
- const DictionaryValue* print_system_settings) {
- return new PrintSystemWin;
-}
-
-} // namespace cloud_print
-
+} // namespace printing
Property changes on: printing/backend/print_backend_win.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « printing/backend/print_backend_dummy.cc ('k') | printing/backend/win_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698