| 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_H_ | 5 #ifndef MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ |
| 6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ | 6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_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/service_manager/public/cpp/binder_registry.h" | 13 #include "services/service_manager/public/cpp/binder_registry.h" |
| 14 #include "services/service_manager/public/cpp/interface_factory.h" | 14 #include "services/service_manager/public/cpp/interface_factory.h" |
| 15 #include "services/service_manager/public/cpp/service.h" | 15 #include "services/service_manager/public/cpp/service.h" |
| 16 #include "services/tracing/public/cpp/provider.h" | |
| 17 | 16 |
| 18 namespace views { | 17 namespace views { |
| 19 class AuraInit; | 18 class AuraInit; |
| 20 class Widget; | 19 class Widget; |
| 21 } | 20 } |
| 22 | 21 |
| 23 namespace mash { | 22 namespace mash { |
| 24 namespace quick_launch { | 23 namespace quick_launch { |
| 25 | 24 |
| 26 class QuickLaunch | 25 class QuickLaunch |
| (...skipping 18 matching lines...) Expand all Loading... |
| 45 | 44 |
| 46 // service_manager::InterfaceFactory<::mash::mojom::Launchable>: | 45 // service_manager::InterfaceFactory<::mash::mojom::Launchable>: |
| 47 void Create(const service_manager::Identity& remote_identity, | 46 void Create(const service_manager::Identity& remote_identity, |
| 48 ::mash::mojom::LaunchableRequest request) override; | 47 ::mash::mojom::LaunchableRequest request) override; |
| 49 | 48 |
| 50 mojo::BindingSet<::mash::mojom::Launchable> bindings_; | 49 mojo::BindingSet<::mash::mojom::Launchable> bindings_; |
| 51 std::vector<views::Widget*> windows_; | 50 std::vector<views::Widget*> windows_; |
| 52 | 51 |
| 53 service_manager::BinderRegistry registry_; | 52 service_manager::BinderRegistry registry_; |
| 54 | 53 |
| 55 tracing::Provider tracing_; | |
| 56 std::unique_ptr<views::AuraInit> aura_init_; | 54 std::unique_ptr<views::AuraInit> aura_init_; |
| 57 | 55 |
| 58 DISALLOW_COPY_AND_ASSIGN(QuickLaunch); | 56 DISALLOW_COPY_AND_ASSIGN(QuickLaunch); |
| 59 }; | 57 }; |
| 60 | 58 |
| 61 } // namespace quick_launch | 59 } // namespace quick_launch |
| 62 } // namespace mash | 60 } // namespace mash |
| 63 | 61 |
| 64 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ | 62 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ |
| OLD | NEW |