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

Unified Diff: chrome/browser/ui/webui/print_preview/extension_printer_handler.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/ui/webui/print_preview/extension_printer_handler.h
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler.h b/chrome/browser/ui/webui/print_preview/extension_printer_handler.h
index 18685420c09fe511e26443f0c734fb3f8152b7eb..3a0c9f5c1037b023a9b32596e247051ff0f77a23 100644
--- a/chrome/browser/ui/webui/print_preview/extension_printer_handler.h
+++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_EXTENSION_PRINTER_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_EXTENSION_PRINTER_HANDLER_H_
+#include <memory>
#include <string>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
#include "chrome/browser/ui/webui/print_preview/printer_handler.h"
@@ -46,8 +46,8 @@ class PWGRasterConverter;
// extension API.
class ExtensionPrinterHandler : public PrinterHandler {
public:
- using PrintJobCallback =
- base::Callback<void(scoped_ptr<extensions::PrinterProviderPrintJob>)>;
+ using PrintJobCallback = base::Callback<void(
+ std::unique_ptr<extensions::PrinterProviderPrintJob>)>;
ExtensionPrinterHandler(
content::BrowserContext* browser_context,
@@ -78,7 +78,7 @@ class ExtensionPrinterHandler : public PrinterHandler {
friend class ExtensionPrinterHandlerTest;
void SetPWGRasterConverterForTesting(
- scoped_ptr<printing::PWGRasterConverter> pwg_raster_converter);
+ std::unique_ptr<printing::PWGRasterConverter> pwg_raster_converter);
// Converts |data| to PWG raster format (from PDF) for a printer described
// by |printer_description|.
@@ -88,13 +88,13 @@ class ExtensionPrinterHandler : public PrinterHandler {
const cloud_devices::CloudDeviceDescription& printer_description,
const cloud_devices::CloudDeviceDescription& ticket,
const gfx::Size& page_size,
- scoped_ptr<extensions::PrinterProviderPrintJob> job,
+ std::unique_ptr<extensions::PrinterProviderPrintJob> job,
const PrintJobCallback& callback);
// Sets print job document data and dispatches it using printerProvider API.
void DispatchPrintJob(
const PrinterHandler::PrintCallback& callback,
- scoped_ptr<extensions::PrinterProviderPrintJob> print_job);
+ std::unique_ptr<extensions::PrinterProviderPrintJob> print_job);
// Methods used as wrappers to callbacks for extensions::PrinterProviderAPI
// methods, primarily so the callbacks can be bound to this class' weak ptr.
@@ -119,7 +119,7 @@ class ExtensionPrinterHandler : public PrinterHandler {
content::BrowserContext* browser_context_;
- scoped_ptr<printing::PWGRasterConverter> pwg_raster_converter_;
+ std::unique_ptr<printing::PWGRasterConverter> pwg_raster_converter_;
int pending_enumeration_count_ = 0;
scoped_refptr<base::TaskRunner> slow_task_runner_;

Powered by Google App Engine
This is Rietveld 408576698