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

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_distiller.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/print_preview_distiller.h
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_distiller.h b/chrome/browser/ui/webui/print_preview/print_preview_distiller.h
index aef2cea6cb6f8b5dc857f5a5769b1004abc190a7..5e76849d8775f4d1c1cedacbbeb63d1b326d55ec 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_distiller.h
+++ b/chrome/browser/ui/webui/print_preview/print_preview_distiller.h
@@ -5,10 +5,11 @@
#ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_DISTILLER_H_
#define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_DISTILLER_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/feature_list.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
#include "content/public/browser/web_contents_observer.h"
@@ -27,7 +28,7 @@ class PrintPreviewDistiller {
PrintPreviewDistiller(content::WebContents* source_web_contents,
base::Closure on_failed_callback,
- scoped_ptr<base::DictionaryValue> settings);
+ std::unique_ptr<base::DictionaryValue> settings);
~PrintPreviewDistiller();
private:
@@ -39,7 +40,7 @@ class PrintPreviewDistiller {
void CreateDestinationWebContents(
content::SessionStorageNamespace* session_storage_namespace,
content::WebContents* source_web_contents,
- scoped_ptr<base::DictionaryValue> settings,
+ std::unique_ptr<base::DictionaryValue> settings,
base::Closure on_failed_callback);
content::WebContents* CreateWebContents(
@@ -47,9 +48,9 @@ class PrintPreviewDistiller {
content::WebContents* source_web_contents);
// The distilled rendered WebContents; may be null.
- scoped_ptr<content::WebContents> web_contents_;
+ std::unique_ptr<content::WebContents> web_contents_;
- scoped_ptr<WebContentsDelegateImpl> web_contents_delegate_;
+ std::unique_ptr<WebContentsDelegateImpl> web_contents_delegate_;
DISALLOW_COPY_AND_ASSIGN(PrintPreviewDistiller);
};

Powered by Google App Engine
This is Rietveld 408576698