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

Unified Diff: printing/backend/print_backend_win.cc

Issue 191913002: scoped_ptr<DEVMODE[]> replaced with scoped_ptr<DEVMODE, base::FreeDeleter>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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') | 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
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index 06bd5c9a8f4c5e7c17cfb5c0e870664e211e672b..75c562a130694674d14fc42300ceabfd33d5dba6 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -233,13 +233,14 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
PrinterSemanticCapsAndDefaults caps;
- scoped_ptr<DEVMODE[]> user_settings = CreateDevMode(printer_handle, NULL);
+ scoped_ptr<DEVMODE, base::FreeDeleter> user_settings =
+ CreateDevMode(printer_handle, NULL);
if (user_settings) {
- if (user_settings.get()->dmFields & DM_COLOR)
- caps.color_default = (user_settings.get()->dmColor == DMCOLOR_COLOR);
+ if (user_settings->dmFields & DM_COLOR)
+ caps.color_default = (user_settings->dmColor == DMCOLOR_COLOR);
- if (user_settings.get()->dmFields & DM_DUPLEX) {
- switch (user_settings.get()->dmDuplex) {
+ if (user_settings->dmFields & DM_DUPLEX) {
+ switch (user_settings->dmDuplex) {
case DMDUP_SIMPLEX:
caps.duplex_default = SIMPLEX;
break;
@@ -254,8 +255,8 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
}
}
- if (user_settings.get()->dmFields & DM_COLLATE)
- caps.collate_default = (user_settings.get()->dmCollate == DMCOLLATE_TRUE);
+ if (user_settings->dmFields & DM_COLLATE)
+ caps.collate_default = (user_settings->dmCollate == DMCOLLATE_TRUE);
} else {
LOG(WARNING) << "Fallback to color/simplex mode.";
caps.color_default = caps.color_changeable;
@@ -320,7 +321,8 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
}
ScopedPrinterHandle printer_handle;
if (printer_handle.OpenPrinter(printer_name_wide.c_str())) {
- scoped_ptr<DEVMODE[]> devmode_out(CreateDevMode(printer_handle, NULL));
+ scoped_ptr<DEVMODE, base::FreeDeleter> devmode_out(
+ CreateDevMode(printer_handle, NULL));
if (!devmode_out)
return false;
base::win::ScopedComPtr<IStream> printer_defaults_stream;
@@ -328,8 +330,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
printer_defaults_stream.Receive());
DCHECK(SUCCEEDED(hr));
if (printer_defaults_stream) {
- DWORD dm_size = devmode_out.get()->dmSize +
- devmode_out.get()->dmDriverExtra;
+ DWORD dm_size = devmode_out->dmSize + devmode_out->dmDriverExtra;
hr = XPSModule::ConvertDevModeToPrintTicket(provider, dm_size,
devmode_out.get(), kPTJobScope, printer_defaults_stream);
DCHECK(SUCCEEDED(hr));
« no previous file with comments | « chrome/service/cloud_print/print_system_win.cc ('k') | printing/backend/win_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698