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_SYSTEM_UI_SYSTEM_UI_H_ | 5 #ifndef MASH_SHELF_SHELF_APPLICATION_H_ |
6 #define MASH_SYSTEM_UI_SYSTEM_UI_H_ | 6 #define MASH_SHELF_SHELF_APPLICATION_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "components/mus/public/interfaces/user_window_controller.mojom.h" |
10 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 11 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
11 #include "mojo/shell/public/cpp/application_delegate.h" | 12 #include "mojo/shell/public/cpp/application_delegate.h" |
| 13 #include "mojo/shell/public/cpp/interface_factory_impl.h" |
12 | 14 |
13 namespace views { | 15 namespace views { |
14 class AuraInit; | 16 class AuraInit; |
15 } | 17 } |
16 | 18 |
17 namespace mash { | 19 namespace mash { |
18 namespace system_ui { | 20 namespace shelf { |
19 | 21 |
20 class SystemUI : public mojo::ApplicationDelegate { | 22 class ShelfApplication : public mojo::ApplicationDelegate { |
21 public: | 23 public: |
22 SystemUI(); | 24 ShelfApplication(); |
23 ~SystemUI() override; | 25 ~ShelfApplication() override; |
24 | 26 |
25 private: | 27 private: |
26 // mojo::ApplicationDelegate: | 28 // mojo::ApplicationDelegate: |
27 void Initialize(mojo::ApplicationImpl* app) override; | 29 void Initialize(mojo::ApplicationImpl* app) override; |
28 bool ConfigureIncomingConnection( | 30 bool ConfigureIncomingConnection( |
29 mojo::ApplicationConnection* connection) override; | 31 mojo::ApplicationConnection* connection) override; |
30 | 32 |
31 mojo::TracingImpl tracing_; | 33 mojo::TracingImpl tracing_; |
32 | 34 |
33 scoped_ptr<views::AuraInit> aura_init_; | 35 scoped_ptr<views::AuraInit> aura_init_; |
34 | 36 |
35 DISALLOW_COPY_AND_ASSIGN(SystemUI); | 37 DISALLOW_COPY_AND_ASSIGN(ShelfApplication); |
36 }; | 38 }; |
37 | 39 |
38 } // namespace system_ui | 40 } // namespace shelf |
39 } // namespace mash | 41 } // namespace mash |
40 | 42 |
41 #endif // MASH_SYSTEM_UI_SYSTEM_UI_H_ | 43 #endif // MASH_SHELF_SHELF_APPLICATION_H_ |
OLD | NEW |