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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_; | 99 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_; |
100 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> | 100 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> |
101 statistics_provider_; | 101 statistics_provider_; |
102 | 102 |
103 service_manager::BinderRegistry registry_; | 103 service_manager::BinderRegistry registry_; |
104 | 104 |
105 std::unique_ptr<ShellDelegate> shell_delegate_; | 105 std::unique_ptr<ShellDelegate> shell_delegate_; |
106 | 106 |
107 const Config ash_config_; | 107 const Config ash_config_; |
108 | 108 |
| 109 // Whether this class initialized NetworkHandler and needs to clean it up. |
| 110 bool network_handler_initialized_ = false; |
| 111 |
| 112 // Whether this class initialized DBusThreadManager and needs to clean it up. |
| 113 bool dbus_thread_manager_initialized_ = false; |
| 114 |
109 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 115 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
110 }; | 116 }; |
111 | 117 |
112 } // namespace mus | 118 } // namespace mus |
113 } // namespace ash | 119 } // namespace ash |
114 | 120 |
115 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 121 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
OLD | NEW |