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

Unified Diff: mash/screenlock/screenlock.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/quick_launch/quick_launch_application.cc ('k') | mash/session/session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/screenlock/screenlock.h
diff --git a/mash/screenlock/screenlock.h b/mash/screenlock/screenlock.h
index 3808f5ad9e8ff59aba5a0402383bbc403908b8ff..dc2f80f1e336aeb736af72714477a63f70503bbf 100644
--- a/mash/screenlock/screenlock.h
+++ b/mash/screenlock/screenlock.h
@@ -6,9 +6,9 @@
#define MASH_SCREENLOCK_SCREENLOCK_H_
#include <map>
+#include <memory>
#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/services/tracing/public/cpp/tracing_impl.h"
@@ -37,7 +37,7 @@ class Screenlock : public mojo::ShellClient,
void ScreenlockStateChanged(bool locked) override;
mojo::TracingImpl tracing_;
- scoped_ptr<views::AuraInit> aura_init_;
+ std::unique_ptr<views::AuraInit> aura_init_;
mojo::BindingSet<session::mojom::ScreenlockStateListener> bindings_;
DISALLOW_COPY_AND_ASSIGN(Screenlock);
« no previous file with comments | « mash/quick_launch/quick_launch_application.cc ('k') | mash/session/session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698