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

Side by Side Diff: mash/task_viewer/task_viewer.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/session/session.cc ('k') | mash/task_viewer/task_viewer.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_TASK_VIEWER_TASK_VIEWER_H_ 5 #ifndef MASH_TASK_VIEWER_TASK_VIEWER_H_
6 #define MASH_TASK_VIEWER_TASK_VIEWER_H_ 6 #define MASH_TASK_VIEWER_TASK_VIEWER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 10
10 #include "base/callback.h" 11 #include "base/callback.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "mojo/services/tracing/public/cpp/tracing_impl.h" 13 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
14 #include "mojo/shell/public/cpp/shell_client.h" 14 #include "mojo/shell/public/cpp/shell_client.h"
15 15
16 namespace views { 16 namespace views {
17 class AuraInit; 17 class AuraInit;
18 } 18 }
19 19
20 namespace mash { 20 namespace mash {
21 namespace task_viewer { 21 namespace task_viewer {
22 22
23 class TaskViewer : public mojo::ShellClient { 23 class TaskViewer : public mojo::ShellClient {
24 public: 24 public:
25 TaskViewer(); 25 TaskViewer();
26 ~TaskViewer() override; 26 ~TaskViewer() override;
27 27
28 private: 28 private:
29 // mojo::ShellClient: 29 // mojo::ShellClient:
30 void Initialize(mojo::Connector* connector, 30 void Initialize(mojo::Connector* connector,
31 const mojo::Identity& identity, 31 const mojo::Identity& identity,
32 uint32_t id) override; 32 uint32_t id) override;
33 33
34 mojo::TracingImpl tracing_; 34 mojo::TracingImpl tracing_;
35 scoped_ptr<views::AuraInit> aura_init_; 35 std::unique_ptr<views::AuraInit> aura_init_;
36 36
37 DISALLOW_COPY_AND_ASSIGN(TaskViewer); 37 DISALLOW_COPY_AND_ASSIGN(TaskViewer);
38 }; 38 };
39 39
40 } // namespace task_viewer 40 } // namespace task_viewer
41 } // namespace mash 41 } // namespace mash
42 42
43 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_ 43 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_
OLDNEW
« no previous file with comments | « mash/session/session.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698