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

Unified Diff: content/browser/mojo/mojo_application_host.h

Issue 1874893002: Convert //content/browser from scoped_ptr to 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 | « content/browser/mojo/mojo_app_connection_impl.cc ('k') | content/browser/mojo/mojo_child_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/mojo_application_host.h
diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
index 3f3387acceae896d745beaf6c4f5c9a4ad924754..0d7916fe9763f85464d3b392a11e7128dda38d37 100644
--- a/content/browser/mojo/mojo_application_host.h
+++ b/content/browser/mojo/mojo_application_host.h
@@ -5,8 +5,9 @@
#ifndef CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
#define CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/process/process_handle.h"
#include "build/build_config.h"
#include "content/common/application_setup.mojom.h"
@@ -58,13 +59,13 @@ class CONTENT_EXPORT MojoApplicationHost {
bool did_activate_;
- scoped_ptr<mojom::ApplicationSetup> application_setup_;
+ std::unique_ptr<mojom::ApplicationSetup> application_setup_;
ServiceRegistryImpl service_registry_;
scoped_refptr<base::TaskRunner> io_task_runner_override_;
#if defined(OS_ANDROID)
- scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
+ std::unique_ptr<ServiceRegistryAndroid> service_registry_android_;
#endif
DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
« no previous file with comments | « content/browser/mojo/mojo_app_connection_impl.cc ('k') | content/browser/mojo/mojo_child_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698