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

Unified Diff: chrome/service/cloud_print/cdd_conversion_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/cdd_conversion_win.h ('k') | chrome/service/cloud_print/print_system_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/cloud_print/cdd_conversion_win.cc
diff --git a/chrome/service/cloud_print/cdd_conversion_win.cc b/chrome/service/cloud_print/cdd_conversion_win.cc
index f71ed64973f9c9dc2c40b6ac7287d098bbe8c975..93fd8363915cfdbb3a947536862a78c90d0bbfa6 100644
--- a/chrome/service/cloud_print/cdd_conversion_win.cc
+++ b/chrome/service/cloud_print/cdd_conversion_win.cc
@@ -15,32 +15,32 @@ bool IsValidCjt(const std::string& print_ticket_data) {
return description.InitFromString(print_ticket_data);
}
-scoped_ptr<DEVMODE[]> CjtToDevMode(const base::string16& printer_name,
- const std::string& print_ticket) {
- using namespace cloud_devices::printer;
+scoped_ptr<DEVMODE, base::FreeDeleter> CjtToDevMode(
+ const base::string16& printer_name,
+ const std::string& print_ticket) {
+ scoped_ptr<DEVMODE, base::FreeDeleter> dev_mode;
+
cloud_devices::CloudDeviceDescription description;
if (!description.InitFromString(print_ticket))
- return scoped_ptr<DEVMODE[]>();
+ return dev_mode.Pass();
+ using namespace cloud_devices::printer;
printing::ScopedPrinterHandle printer;
if (!printer.OpenPrinter(printer_name.c_str()))
- return scoped_ptr<DEVMODE[]>();
+ return dev_mode.Pass();
- scoped_ptr<DEVMODE[]> scoped_dev_mode;
{
ColorTicketItem color;
if (color.LoadFrom(description)) {
bool is_color = color.value().type == STANDARD_COLOR;
- scoped_dev_mode = CreateDevModeWithColor(printer, printer_name, is_color);
+ dev_mode = CreateDevModeWithColor(printer, printer_name, is_color);
} else {
- scoped_dev_mode = printing::CreateDevMode(printer, NULL);
+ dev_mode = printing::CreateDevMode(printer, NULL);
}
}
- if (!scoped_dev_mode)
- return scoped_ptr<DEVMODE[]>();
-
- DEVMODE* dev_mode = scoped_dev_mode.get();
+ if (!dev_mode)
+ return dev_mode.Pass();
ColorTicketItem color;
DuplexTicketItem duplex;
@@ -122,7 +122,7 @@ scoped_ptr<DEVMODE[]> CjtToDevMode(const base::string16& printer_name,
}
}
- return printing::CreateDevMode(printer, dev_mode);
+ return printing::CreateDevMode(printer, dev_mode.get());
}
std::string CapabilitiesToCdd(
« no previous file with comments | « chrome/service/cloud_print/cdd_conversion_win.h ('k') | chrome/service/cloud_print/print_system_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698