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

Unified Diff: content/shell/app/shell_main_delegate.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent 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 | « content/renderer/raster_worker_pool.h ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/app/shell_main_delegate.h
diff --git a/content/shell/app/shell_main_delegate.h b/content/shell/app/shell_main_delegate.h
index 59cf53c3ee88f9d931c993beaed03efcdffd7121..1297ff867b8c90c84a0d77506e6334946664c0c2 100644
--- a/content/shell/app/shell_main_delegate.h
+++ b/content/shell/app/shell_main_delegate.h
@@ -5,9 +5,10 @@
#ifndef CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
#define CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "content/public/app/content_main_delegate.h"
@@ -41,13 +42,13 @@ class ShellMainDelegate : public ContentMainDelegate {
static void InitializeResourceBundle();
private:
- scoped_ptr<ShellContentBrowserClient> browser_client_;
- scoped_ptr<ShellContentRendererClient> renderer_client_;
- scoped_ptr<ShellContentUtilityClient> utility_client_;
- scoped_ptr<ContentClient> content_client_;
+ std::unique_ptr<ShellContentBrowserClient> browser_client_;
+ std::unique_ptr<ShellContentRendererClient> renderer_client_;
+ std::unique_ptr<ShellContentUtilityClient> utility_client_;
+ std::unique_ptr<ContentClient> content_client_;
#if defined(OS_ANDROID)
- scoped_ptr<BrowserMainRunner> browser_runner_;
+ std::unique_ptr<BrowserMainRunner> browser_runner_;
#endif
DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
« no previous file with comments | « content/renderer/raster_worker_pool.h ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698