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

Unified Diff: content/browser/mojo/mojo_shell_context.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_child_connection.cc ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/mojo_shell_context.h
diff --git a/content/browser/mojo/mojo_shell_context.h b/content/browser/mojo/mojo_shell_context.h
index 959fd933af78aa251f52b00e0281e19b385212ff..774bfec1d455c52c987d01ee30c80fa656c664f5 100644
--- a/content/browser/mojo/mojo_shell_context.h
+++ b/content/browser/mojo/mojo_shell_context.h
@@ -6,12 +6,12 @@
#define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
#include <map>
+#include <memory>
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "base/lazy_instance.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/single_thread_task_runner.h"
#include "content/common/content_export.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
@@ -32,7 +32,8 @@ namespace content {
class CONTENT_EXPORT MojoShellContext {
public:
using StaticApplicationMap =
- std::map<std::string, base::Callback<scoped_ptr<mojo::ShellClient>()>>;
+ std::map<std::string,
+ base::Callback<std::unique_ptr<mojo::ShellClient>()>>;
MojoShellContext(scoped_refptr<base::SingleThreadTaskRunner> file_thread,
scoped_refptr<base::SingleThreadTaskRunner> db_thread);
@@ -65,11 +66,11 @@ class CONTENT_EXPORT MojoShellContext {
mojo::shell::mojom::InterfaceProviderPtr exposed_services,
const mojo::shell::mojom::Connector::ConnectCallback& callback);
- static base::LazyInstance<scoped_ptr<Proxy>> proxy_;
+ static base::LazyInstance<std::unique_ptr<Proxy>> proxy_;
- scoped_ptr<BuiltinManifestProvider> manifest_provider_;
- scoped_ptr<catalog::Factory> catalog_;
- scoped_ptr<mojo::shell::Shell> shell_;
+ std::unique_ptr<BuiltinManifestProvider> manifest_provider_;
+ std::unique_ptr<catalog::Factory> catalog_;
+ std::unique_ptr<mojo::shell::Shell> shell_;
DISALLOW_COPY_AND_ASSIGN(MojoShellContext);
};
« no previous file with comments | « content/browser/mojo/mojo_child_connection.cc ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698