diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 00:49:49 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 00:49:49 +0000 |
| commit | 2b364bebf11285aaf97e3f4e97c46e96aeaf91f5 (patch) | |
| tree | f399e636f8d2636e1c3905197a0ca740c870a7ac /printing/backend/win_helper.h | |
| parent | 5f34923604562a6b0043106bde992fc25a64cfba (diff) | |
| download | chromium_src-2b364bebf11285aaf97e3f4e97c46e96aeaf91f5.zip chromium_src-2b364bebf11285aaf97e3f4e97c46e96aeaf91f5.tar.gz chromium_src-2b364bebf11285aaf97e3f4e97c46e96aeaf91f5.tar.bz2 | |
scoped_ptr<DEVMODE[]> replaced with scoped_ptr<DEVMODE, base::FreeDeleter>.
NOTRY=true
Review URL: https://codereview.chromium.org/191913002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/backend/win_helper.h')
| -rw-r--r-- | printing/backend/win_helper.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/printing/backend/win_helper.h b/printing/backend/win_helper.h index 9b998d7..18d0355 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 |