| OLD | NEW |
| 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 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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::Shell* shell, const std::string& url, | 30 void Initialize(mojo::Shell* shell, const std::string& url, |
| 31 uint32_t id) override; | 31 uint32_t id, uint32_t user_id) override; |
| 32 | 32 |
| 33 mojo::TracingImpl tracing_; | 33 mojo::TracingImpl tracing_; |
| 34 scoped_ptr<views::AuraInit> aura_init_; | 34 scoped_ptr<views::AuraInit> aura_init_; |
| 35 | 35 |
| 36 DISALLOW_COPY_AND_ASSIGN(TaskViewer); | 36 DISALLOW_COPY_AND_ASSIGN(TaskViewer); |
| 37 }; | 37 }; |
| 38 | 38 |
| 39 } // namespace task_viewer | 39 } // namespace task_viewer |
| 40 } // namespace mash | 40 } // namespace mash |
| 41 | 41 |
| 42 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_ | 42 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_ |
| OLD | NEW |