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

Side by Side 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, 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MASH_SCREENLOCK_SCREENLOCK_H_ 5 #ifndef MASH_SCREENLOCK_SCREENLOCK_H_
6 #define MASH_SCREENLOCK_SCREENLOCK_H_ 6 #define MASH_SCREENLOCK_SCREENLOCK_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "mash/session/public/interfaces/session.mojom.h" 12 #include "mash/session/public/interfaces/session.mojom.h"
13 #include "mojo/public/cpp/bindings/binding_set.h" 13 #include "mojo/public/cpp/bindings/binding_set.h"
14 #include "mojo/services/tracing/public/cpp/tracing_impl.h" 14 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
15 #include "mojo/shell/public/cpp/shell_client.h" 15 #include "mojo/shell/public/cpp/shell_client.h"
16 16
17 namespace views { 17 namespace views {
18 class AuraInit; 18 class AuraInit;
19 } 19 }
20 20
21 namespace mash { 21 namespace mash {
22 namespace screenlock { 22 namespace screenlock {
23 23
24 class Screenlock : public mojo::ShellClient, 24 class Screenlock : public mojo::ShellClient,
25 public session::mojom::ScreenlockStateListener { 25 public session::mojom::ScreenlockStateListener {
26 public: 26 public:
27 Screenlock(); 27 Screenlock();
28 ~Screenlock() override; 28 ~Screenlock() override;
29 29
30 private: 30 private:
31 // mojo::ShellClient: 31 // mojo::ShellClient:
32 void Initialize(mojo::Connector* connector, 32 void Initialize(mojo::Connector* connector,
33 const mojo::Identity& identity, 33 const mojo::Identity& identity,
34 uint32_t id) override; 34 uint32_t id) override;
35 35
36 // session::mojom::ScreenlockStateListener: 36 // session::mojom::ScreenlockStateListener:
37 void ScreenlockStateChanged(bool locked) override; 37 void ScreenlockStateChanged(bool locked) override;
38 38
39 mojo::TracingImpl tracing_; 39 mojo::TracingImpl tracing_;
40 scoped_ptr<views::AuraInit> aura_init_; 40 std::unique_ptr<views::AuraInit> aura_init_;
41 mojo::BindingSet<session::mojom::ScreenlockStateListener> bindings_; 41 mojo::BindingSet<session::mojom::ScreenlockStateListener> bindings_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(Screenlock); 43 DISALLOW_COPY_AND_ASSIGN(Screenlock);
44 }; 44 };
45 45
46 } // namespace screenlock 46 } // namespace screenlock
47 } // namespace mash 47 } // namespace mash
48 48
49 #endif // MASH_SCREENLOCK_SCREENLOCK_H_ 49 #endif // MASH_SCREENLOCK_SCREENLOCK_H_
OLDNEW
« 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