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

Unified Diff: mash/init/init.h

Issue 1857623003: convert //mash 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 | « mash/example/window_type_launcher/window_type_launcher.cc ('k') | mash/init/init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/init/init.h
diff --git a/mash/init/init.h b/mash/init/init.h
index 7f27a6d0e7008e45e314e32b42fb166aca527666..2905375799820b879c338383a18c3b611b9df4bb 100644
--- a/mash/init/init.h
+++ b/mash/init/init.h
@@ -6,10 +6,10 @@
#define MASH_INIT_INIT_H_
#include <map>
+#include <memory>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "mash/init/public/interfaces/init.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/shell/public/cpp/connector.h"
@@ -51,9 +51,9 @@ class Init : public mojo::ShellClient,
void StartLogin();
mojo::Connector* connector_;
- scoped_ptr<mojo::Connection> login_connection_;
+ std::unique_ptr<mojo::Connection> login_connection_;
mojo::BindingSet<mojom::Init> init_bindings_;
- std::map<std::string, scoped_ptr<mojo::Connection>> user_services_;
+ std::map<std::string, std::unique_ptr<mojo::Connection>> user_services_;
DISALLOW_COPY_AND_ASSIGN(Init);
};
« no previous file with comments | « mash/example/window_type_launcher/window_type_launcher.cc ('k') | mash/init/init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698