OLD | NEW |
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_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ | 5 #ifndef MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ |
6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ | 6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "mash/public/interfaces/launchable.mojom.h" | 11 #include "mash/public/interfaces/launchable.mojom.h" |
12 #include "mojo/public/cpp/bindings/binding_set.h" | 12 #include "mojo/public/cpp/bindings/binding_set.h" |
13 #include "services/shell/public/cpp/shell_client.h" | 13 #include "services/shell/public/cpp/shell_client.h" |
14 #include "services/tracing/public/cpp/tracing_impl.h" | 14 #include "services/tracing/public/cpp/tracing_impl.h" |
15 | 15 |
16 namespace views { | 16 namespace views { |
17 class AuraInit; | 17 class AuraInit; |
18 class Widget; | 18 class Widget; |
| 19 class WindowManagerConnection; |
19 } | 20 } |
20 | 21 |
21 namespace mash { | 22 namespace mash { |
22 namespace quick_launch { | 23 namespace quick_launch { |
23 | 24 |
24 class QuickLaunchApplication | 25 class QuickLaunchApplication |
25 : public shell::ShellClient, | 26 : public shell::ShellClient, |
26 public mojom::Launchable, | 27 public mojom::Launchable, |
27 public shell::InterfaceFactory<mojom::Launchable> { | 28 public shell::InterfaceFactory<mojom::Launchable> { |
28 public: | 29 public: |
(...skipping 15 matching lines...) Expand all Loading... |
44 // shell::InterfaceFactory<mojom::Launchable>: | 45 // shell::InterfaceFactory<mojom::Launchable>: |
45 void Create(shell::Connection* connection, | 46 void Create(shell::Connection* connection, |
46 mojom::LaunchableRequest request) override; | 47 mojom::LaunchableRequest request) override; |
47 | 48 |
48 shell::Connector* connector_ = nullptr; | 49 shell::Connector* connector_ = nullptr; |
49 mojo::BindingSet<mojom::Launchable> bindings_; | 50 mojo::BindingSet<mojom::Launchable> bindings_; |
50 std::vector<views::Widget*> windows_; | 51 std::vector<views::Widget*> windows_; |
51 | 52 |
52 mojo::TracingImpl tracing_; | 53 mojo::TracingImpl tracing_; |
53 std::unique_ptr<views::AuraInit> aura_init_; | 54 std::unique_ptr<views::AuraInit> aura_init_; |
| 55 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
54 | 56 |
55 DISALLOW_COPY_AND_ASSIGN(QuickLaunchApplication); | 57 DISALLOW_COPY_AND_ASSIGN(QuickLaunchApplication); |
56 }; | 58 }; |
57 | 59 |
58 } // namespace quick_launch | 60 } // namespace quick_launch |
59 } // namespace mash | 61 } // namespace mash |
60 | 62 |
61 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ | 63 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ |
OLD | NEW |