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_APPLICATION_DELEGATE_H_ | 5 #ifndef MASH_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_ |
6 #define MASH_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_ | 6 #define MASH_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 namespace mash { | 24 namespace mash { |
25 namespace task_viewer { | 25 namespace task_viewer { |
26 | 26 |
27 class TaskViewerApplicationDelegate : public mojo::ApplicationDelegate { | 27 class TaskViewerApplicationDelegate : public mojo::ApplicationDelegate { |
28 public: | 28 public: |
29 TaskViewerApplicationDelegate(); | 29 TaskViewerApplicationDelegate(); |
30 ~TaskViewerApplicationDelegate() override; | 30 ~TaskViewerApplicationDelegate() override; |
31 | 31 |
32 private: | 32 private: |
33 // mojo::ApplicationDelegate: | 33 // mojo::ApplicationDelegate: |
34 void Initialize(mojo::ApplicationImpl* app) override; | 34 void Initialize(mojo::Shell* shell, const std::string& url, |
| 35 uint32_t id) override; |
35 | 36 |
36 mojo::TracingImpl tracing_; | 37 mojo::TracingImpl tracing_; |
37 scoped_ptr<views::AuraInit> aura_init_; | 38 scoped_ptr<views::AuraInit> aura_init_; |
38 | 39 |
39 DISALLOW_COPY_AND_ASSIGN(TaskViewerApplicationDelegate); | 40 DISALLOW_COPY_AND_ASSIGN(TaskViewerApplicationDelegate); |
40 }; | 41 }; |
41 | 42 |
42 } // namespace task_viewer | 43 } // namespace task_viewer |
43 } // namespace mash | 44 } // namespace mash |
44 | 45 |
45 #endif // MASH_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_ | 46 #endif // MASH_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_ |
OLD | NEW |