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

Unified Diff: printing/backend/win_helper.h

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 | « printing/backend/print_backend_win.cc ('k') | 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/win_helper.h
diff --git a/printing/backend/win_helper.h b/printing/backend/win_helper.h
index 9b998d715ac878b3cd2e98d9ab21335740942f29..18d035557e8a5785d4bffb50f5f0b7eef1165962 100644
--- a/printing/backend/win_helper.h
+++ b/printing/backend/win_helper.h
@@ -6,8 +6,8 @@
#define PRINTING_BACKEND_WIN_HELPER_H_
#include <objidl.h>
-#include <winspool.h>
#include <prntvpt.h>
+#include <winspool.h>
#include <xpsprint.h>
#include <string>
@@ -170,20 +170,21 @@ PRINTING_EXPORT bool InitBasicPrinterInfo(HANDLE printer,
PRINTING_EXPORT std::string GetDriverInfo(HANDLE printer);
-PRINTING_EXPORT scoped_ptr<DEVMODE[]> XpsTicketToDevMode(
+PRINTING_EXPORT scoped_ptr<DEVMODE, base::FreeDeleter> XpsTicketToDevMode(
const base::string16& printer_name,
const std::string& print_ticket);
// Creates default DEVMODE and sets color option. Some devices need special
// workaround for color.
-PRINTING_EXPORT scoped_ptr<DEVMODE[]> CreateDevModeWithColor(
+PRINTING_EXPORT scoped_ptr<DEVMODE, base::FreeDeleter> CreateDevModeWithColor(
HANDLE printer,
const base::string16& printer_name,
bool color);
// Creates new DEVMODE. If |in| is not NULL copy settings from there.
-PRINTING_EXPORT scoped_ptr<DEVMODE[]> CreateDevMode(HANDLE printer,
- DEVMODE* in);
+PRINTING_EXPORT scoped_ptr<DEVMODE, base::FreeDeleter> CreateDevMode(
+ HANDLE printer,
+ DEVMODE* in);
} // namespace printing
« no previous file with comments | « printing/backend/print_backend_win.cc ('k') | printing/backend/win_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698