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

Unified Diff: printing/backend/win_helper.h

Issue 1863223002: Convert //printing to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/printing_info_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 fa39a0367f7bfc4fbe92a9de88867ff69d82e283..05e0fe97c78066159da8e1f6ce22227c1506307a 100644
--- a/printing/backend/win_helper.h
+++ b/printing/backend/win_helper.h
@@ -10,11 +10,11 @@
#include <winspool.h>
#include <xpsprint.h>
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/free_deleter.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "base/win/scoped_handle.h"
#include "printing/printing_export.h"
@@ -172,24 +172,24 @@ PRINTING_EXPORT bool InitBasicPrinterInfo(HANDLE printer,
PRINTING_EXPORT std::string GetDriverInfo(HANDLE printer);
-PRINTING_EXPORT scoped_ptr<DEVMODE, base::FreeDeleter> XpsTicketToDevMode(
+PRINTING_EXPORT std::unique_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, base::FreeDeleter> CreateDevModeWithColor(
- HANDLE printer,
- const base::string16& printer_name,
- bool color);
+PRINTING_EXPORT std::unique_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, base::FreeDeleter> CreateDevMode(
+PRINTING_EXPORT std::unique_ptr<DEVMODE, base::FreeDeleter> CreateDevMode(
HANDLE printer,
DEVMODE* in);
// Prompts for new DEVMODE. If |in| is not NULL copy settings from there.
-PRINTING_EXPORT scoped_ptr<DEVMODE, base::FreeDeleter> PromptDevMode(
+PRINTING_EXPORT std::unique_ptr<DEVMODE, base::FreeDeleter> PromptDevMode(
HANDLE printer,
const base::string16& printer_name,
DEVMODE* in,
« no previous file with comments | « printing/backend/printing_info_win.cc ('k') | printing/backend/win_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698