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

Unified Diff: printing/printing_context_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 | « printing/image_win.cc ('k') | printing/printing_context_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing_context_win.cc
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
index 42ebb1aa0f8ee545e19e7927e7e560975756b403..100eb25b005246a692f18001c13750e4c7b62d87 100644
--- a/printing/printing_context_win.cc
+++ b/printing/printing_context_win.cc
@@ -59,7 +59,7 @@ PrintingContext::Result PrintingContextWin::UseDefaultSettings() {
ScopedPrinterHandle printer;
if (printer.OpenPrinter(default_printer.c_str())) {
scoped_ptr<DEVMODE, base::FreeDeleter> dev_mode =
- CreateDevMode(printer, NULL);
+ CreateDevMode(printer.Get(), NULL);
if (InitializeSettings(default_printer, dev_mode.get()) == OK)
return OK;
}
@@ -89,7 +89,7 @@ PrintingContext::Result PrintingContextWin::UseDefaultSettings() {
if (!printer.OpenPrinter(info_2->pPrinterName))
continue;
scoped_ptr<DEVMODE, base::FreeDeleter> dev_mode =
- CreateDevMode(printer, NULL);
+ CreateDevMode(printer.Get(), NULL);
if (InitializeSettings(info_2->pPrinterName, dev_mode.get()) == OK)
return OK;
}
@@ -144,7 +144,7 @@ PrintingContext::Result PrintingContextWin::UpdatePrinterSettings(
// Make printer changes local to Chrome.
// See MSDN documentation regarding DocumentProperties.
scoped_ptr<DEVMODE, base::FreeDeleter> scoped_dev_mode =
- CreateDevModeWithColor(printer, settings_.device_name(),
+ CreateDevModeWithColor(printer.Get(), settings_.device_name(),
settings_.color() != GRAY);
if (!scoped_dev_mode)
return OnError();
@@ -199,9 +199,9 @@ PrintingContext::Result PrintingContextWin::UpdatePrinterSettings(
// Update data using DocumentProperties.
if (show_system_dialog) {
scoped_dev_mode = ShowPrintDialog(
- printer, delegate_->GetParentView(), scoped_dev_mode.get());
+ printer.Get(), delegate_->GetParentView(), scoped_dev_mode.get());
} else {
- scoped_dev_mode = CreateDevMode(printer, scoped_dev_mode.get());
+ scoped_dev_mode = CreateDevMode(printer.Get(), scoped_dev_mode.get());
}
// Set printer then refresh printer settings.
return InitializeSettings(settings_.device_name(), scoped_dev_mode.get());
@@ -219,7 +219,7 @@ PrintingContext::Result PrintingContextWin::InitWithSettings(
return FAILED;
scoped_ptr<DEVMODE, base::FreeDeleter> dev_mode =
- CreateDevMode(printer, NULL);
+ CreateDevMode(printer.Get(), NULL);
return InitializeSettings(settings_.device_name(), dev_mode.get());
}
« no previous file with comments | « printing/image_win.cc ('k') | printing/printing_context_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698