| 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
|
|
|
|
|