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

Unified Diff: mash/session/session.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/screenlock/screenlock.h ('k') | mash/session/session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/session/session.h
diff --git a/mash/session/session.h b/mash/session/session.h
index a2a133b4063e825921af75f89d18d0c313c668e2..992b7c064462dcc0eb4f8b6a6c1498060dae5234 100644
--- a/mash/session/session.h
+++ b/mash/session/session.h
@@ -6,10 +6,10 @@
#define MASH_SESSION_SESSION_H_
#include <map>
+#include <memory>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "mash/session/public/interfaces/session.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"
@@ -63,7 +63,7 @@ class Session : public mojo::ShellClient,
const base::Closure& restart_callback);
mojo::Connector* connector_;
- std::map<std::string, scoped_ptr<mojo::Connection>> connections_;
+ std::map<std::string, std::unique_ptr<mojo::Connection>> connections_;
bool screen_locked_;
mojo::BindingSet<mojom::Session> bindings_;
mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_;
« no previous file with comments | « mash/screenlock/screenlock.h ('k') | mash/session/session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698