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

Unified Diff: headless/lib/headless_content_main_delegate.h

Issue 1854043002: convert //headless to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « headless/lib/headless_browser_browsertest.cc ('k') | headless/lib/headless_content_main_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: headless/lib/headless_content_main_delegate.h
diff --git a/headless/lib/headless_content_main_delegate.h b/headless/lib/headless_content_main_delegate.h
index b829d0e2ab2bd5cb0f68fb83afd56a6623d57c1c..00a20cf27dcdee0267381b9718dce1e4ee779ae4 100644
--- a/headless/lib/headless_content_main_delegate.h
+++ b/headless/lib/headless_content_main_delegate.h
@@ -5,9 +5,10 @@
#ifndef HEADLESS_LIB_HEADLESS_CONTENT_MAIN_DELEGATE_H_
#define HEADLESS_LIB_HEADLESS_CONTENT_MAIN_DELEGATE_H_
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "content/public/app/content_main_delegate.h"
#include "headless/lib/headless_content_client.h"
@@ -24,7 +25,8 @@ class HeadlessContentRendererClient;
class HeadlessContentMainDelegate : public content::ContentMainDelegate {
public:
- explicit HeadlessContentMainDelegate(scoped_ptr<HeadlessBrowserImpl> browser);
+ explicit HeadlessContentMainDelegate(
+ std::unique_ptr<HeadlessBrowserImpl> browser);
~HeadlessContentMainDelegate() override;
// content::ContentMainDelegate implementation:
@@ -47,12 +49,12 @@ class HeadlessContentMainDelegate : public content::ContentMainDelegate {
static HeadlessContentMainDelegate* GetInstance();
- scoped_ptr<HeadlessContentBrowserClient> browser_client_;
- scoped_ptr<HeadlessContentRendererClient> renderer_client_;
- scoped_ptr<HeadlessContentUtilityClient> utility_client_;
+ std::unique_ptr<HeadlessContentBrowserClient> browser_client_;
+ std::unique_ptr<HeadlessContentRendererClient> renderer_client_;
+ std::unique_ptr<HeadlessContentUtilityClient> utility_client_;
HeadlessContentClient content_client_;
- scoped_ptr<HeadlessBrowserImpl> browser_;
+ std::unique_ptr<HeadlessBrowserImpl> browser_;
DISALLOW_COPY_AND_ASSIGN(HeadlessContentMainDelegate);
};
« no previous file with comments | « headless/lib/headless_browser_browsertest.cc ('k') | headless/lib/headless_content_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698