| 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 ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
| 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <set> | 11 #include <set> |
| 12 | 12 |
| 13 #include "ash/public/cpp/config.h" | 13 #include "ash/public/cpp/config.h" |
| 14 #include "ash/public/interfaces/wallpaper.mojom.h" | 14 #include "ash/public/interfaces/wallpaper.mojom.h" |
| 15 #include "ash/shell_delegate.h" | 15 #include "ash/shell_delegate.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| 17 #include "base/memory/ref_counted.h" | 17 #include "base/memory/ref_counted.h" |
| 18 #include "mojo/public/cpp/bindings/binding.h" | 18 #include "mojo/public/cpp/bindings/binding.h" |
| 19 #include "services/service_manager/public/cpp/binder_registry.h" | 19 #include "services/service_manager/public/cpp/binder_registry.h" |
| 20 #include "services/service_manager/public/cpp/service.h" | 20 #include "services/service_manager/public/cpp/service.h" |
| 21 #include "services/tracing/public/cpp/provider.h" | |
| 22 #include "services/ui/common/types.h" | 21 #include "services/ui/common/types.h" |
| 23 | 22 |
| 24 namespace aura { | 23 namespace aura { |
| 25 class WindowTreeClient; | 24 class WindowTreeClient; |
| 26 } | 25 } |
| 27 | 26 |
| 28 namespace base { | 27 namespace base { |
| 29 class SequencedWorkerPool; | 28 class SequencedWorkerPool; |
| 30 } | 29 } |
| 31 | 30 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 void ShutdownComponents(); | 82 void ShutdownComponents(); |
| 84 | 83 |
| 85 // service_manager::Service: | 84 // service_manager::Service: |
| 86 void OnStart() override; | 85 void OnStart() override; |
| 87 void OnBindInterface(const service_manager::ServiceInfo& source_info, | 86 void OnBindInterface(const service_manager::ServiceInfo& source_info, |
| 88 const std::string& interface_name, | 87 const std::string& interface_name, |
| 89 mojo::ScopedMessagePipeHandle interface_pipe) override; | 88 mojo::ScopedMessagePipeHandle interface_pipe) override; |
| 90 | 89 |
| 91 const bool show_primary_host_on_connect_; | 90 const bool show_primary_host_on_connect_; |
| 92 | 91 |
| 93 tracing::Provider tracing_; | |
| 94 | |
| 95 std::unique_ptr<views::AuraInit> aura_init_; | 92 std::unique_ptr<views::AuraInit> aura_init_; |
| 96 | 93 |
| 97 std::unique_ptr<WindowManager> window_manager_; | 94 std::unique_ptr<WindowManager> window_manager_; |
| 98 | 95 |
| 99 // A blocking pool used by the WindowManager's shell; not used in tests. | 96 // A blocking pool used by the WindowManager's shell; not used in tests. |
| 100 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 97 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 101 | 98 |
| 102 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_; | 99 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_; |
| 103 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> | 100 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> |
| 104 statistics_provider_; | 101 statistics_provider_; |
| 105 | 102 |
| 106 service_manager::BinderRegistry registry_; | 103 service_manager::BinderRegistry registry_; |
| 107 | 104 |
| 108 std::unique_ptr<ShellDelegate> shell_delegate_; | 105 std::unique_ptr<ShellDelegate> shell_delegate_; |
| 109 | 106 |
| 110 const Config ash_config_; | 107 const Config ash_config_; |
| 111 | 108 |
| 112 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 109 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 113 }; | 110 }; |
| 114 | 111 |
| 115 } // namespace mus | 112 } // namespace mus |
| 116 } // namespace ash | 113 } // namespace ash |
| 117 | 114 |
| 118 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 115 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |