diff options
| author | rvargas <rvargas@chromium.org> | 2014-09-25 12:22:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-25 19:23:13 +0000 |
| commit | 9b7c6b0fc723a3c079c290dcd836dee9013d5084 (patch) | |
| tree | a9940c6a727c1501b6009634b018272080015770 /printing/backend/print_backend_win.cc | |
| parent | 4dc6577411f86670aa7845114cbea09498ef3c19 (diff) | |
| download | chromium_src-9b7c6b0fc723a3c079c290dcd836dee9013d5084.zip chromium_src-9b7c6b0fc723a3c079c290dcd836dee9013d5084.tar.gz chromium_src-9b7c6b0fc723a3c079c290dcd836dee9013d5084.tar.bz2 | |
Remove implicit HANDLE conversions from printing.
BUG=416722
R=scottbyer@chromium.org
Review URL: https://codereview.chromium.org/605563002
Cr-Commit-Position: refs/heads/master@{#296759}
Diffstat (limited to 'printing/backend/print_backend_win.cc')
| -rw-r--r-- | printing/backend/print_backend_win.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc index d56ee60..6c6bd69 100644 --- a/printing/backend/print_backend_win.cc +++ b/printing/backend/print_backend_win.cc @@ -197,7 +197,7 @@ bool PrintBackendWin::EnumeratePrinters(PrinterList* printer_list) { ScopedPrinterHandle printer; PrinterBasicInfo info; if (printer.OpenPrinter(printer_info[index].pPrinterName) && - InitBasicPrinterInfo(printer, &info)) { + InitBasicPrinterInfo(printer.Get(), &info)) { info.is_default = (info.printer_name == default_printer); printer_list->push_back(info); } @@ -223,7 +223,7 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults( } PrinterInfo5 info_5; - if (!info_5.Init(printer_handle)) + if (!info_5.Init(printer_handle.Get())) return false; const wchar_t* name = info_5.get()->pPrinterName; const wchar_t* port = info_5.get()->pPortName; @@ -232,7 +232,7 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults( PrinterSemanticCapsAndDefaults caps; scoped_ptr<DEVMODE, base::FreeDeleter> user_settings = - CreateDevMode(printer_handle, NULL); + CreateDevMode(printer_handle.Get(), NULL); if (user_settings) { if (user_settings->dmFields & DM_COLOR) caps.color_default = (user_settings->dmColor == DMCOLOR_COLOR); @@ -322,7 +322,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults( ScopedPrinterHandle printer_handle; if (printer_handle.OpenPrinter(printer_name_wide.c_str())) { scoped_ptr<DEVMODE, base::FreeDeleter> devmode_out( - CreateDevMode(printer_handle, NULL)); + CreateDevMode(printer_handle.Get(), NULL)); if (!devmode_out) return false; base::win::ScopedComPtr<IStream> printer_defaults_stream; @@ -354,7 +354,7 @@ std::string PrintBackendWin::GetPrinterDriverInfo( if (!printer.OpenPrinter(base::UTF8ToWide(printer_name).c_str())) { return std::string(); } - return GetDriverInfo(printer); + return GetDriverInfo(printer.Get()); } bool PrintBackendWin::IsValidPrinter(const std::string& printer_name) { |