| 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> |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 WindowManagerApplication(); | 51 WindowManagerApplication(); |
| 52 ~WindowManagerApplication() override; | 52 ~WindowManagerApplication() override; |
| 53 | 53 |
| 54 WindowManager* window_manager() { return window_manager_.get(); } | 54 WindowManager* window_manager() { return window_manager_.get(); } |
| 55 | 55 |
| 56 private: | 56 private: |
| 57 friend class ash::test::AshTestHelper; | 57 friend class ash::test::AshTestHelper; |
| 58 friend class WmTestBase; | 58 friend class WmTestBase; |
| 59 friend class WmTestHelper; | 59 friend class WmTestHelper; |
| 60 | 60 |
| 61 // If |init_network_handler| is true, chromeos::NetworkHandler is initialized. |
| 61 void InitWindowManager( | 62 void InitWindowManager( |
| 62 std::unique_ptr<aura::WindowTreeClient> window_tree_client, | 63 std::unique_ptr<aura::WindowTreeClient> window_tree_client, |
| 63 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool); | 64 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool, |
| 65 bool init_network_handler); |
| 64 | 66 |
| 65 // Initializes lower-level OS-specific components (e.g. D-Bus services). | 67 // Initializes lower-level OS-specific components (e.g. D-Bus services). |
| 66 void InitializeComponents(); | 68 void InitializeComponents(bool init_network_handler); |
| 67 void ShutdownComponents(); | 69 void ShutdownComponents(); |
| 68 | 70 |
| 69 // service_manager::Service: | 71 // service_manager::Service: |
| 70 void OnStart() override; | 72 void OnStart() override; |
| 71 bool OnConnect(const service_manager::ServiceInfo& remote_info, | 73 bool OnConnect(const service_manager::ServiceInfo& remote_info, |
| 72 service_manager::InterfaceRegistry* registry) override; | 74 service_manager::InterfaceRegistry* registry) override; |
| 73 | 75 |
| 74 tracing::Provider tracing_; | 76 tracing::Provider tracing_; |
| 75 | 77 |
| 76 std::unique_ptr<views::AuraInit> aura_init_; | 78 std::unique_ptr<views::AuraInit> aura_init_; |
| 77 | 79 |
| 78 std::unique_ptr<WindowManager> window_manager_; | 80 std::unique_ptr<WindowManager> window_manager_; |
| 79 | 81 |
| 80 // A blocking pool used by the WindowManager's shell; not used in tests. | 82 // A blocking pool used by the WindowManager's shell; not used in tests. |
| 81 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 83 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 82 | 84 |
| 83 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_; | 85 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_; |
| 84 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> | 86 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> |
| 85 statistics_provider_; | 87 statistics_provider_; |
| 86 | 88 |
| 87 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 89 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 88 }; | 90 }; |
| 89 | 91 |
| 90 } // namespace mus | 92 } // namespace mus |
| 91 } // namespace ash | 93 } // namespace ash |
| 92 | 94 |
| 93 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 95 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |