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

Unified Diff: printing/backend/print_backend_win.cc

Issue 605563002: Remove implicit HANDLE conversions from printing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | printing/backend/win_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/backend/print_backend_win.cc
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index d56ee60e312a813fb31de080b9253d4141144d3f..6c6bd69b9bee7426df7bbe42bb6a97f26c58e794 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) {
« no previous file with comments | « no previous file | printing/backend/win_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698