| 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 MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 5 #ifndef MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| 6 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 6 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 return mash_shell_.get(); | 79 return mash_shell_.get(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 private: | 82 private: |
| 83 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar); | 83 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar); |
| 84 | 84 |
| 85 // mojo::ShellClient: | 85 // mojo::ShellClient: |
| 86 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, | 86 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, |
| 87 uint32_t id) override; | 87 uint32_t id) override; |
| 88 bool AcceptConnection(mojo::Connection* connection) override; | 88 bool AcceptConnection(mojo::Connection* connection) override; |
| 89 void ShellConnectionLost() override; |
| 89 | 90 |
| 90 // InterfaceFactory<mash::wm::mojom::UserWindowController>: | 91 // InterfaceFactory<mash::wm::mojom::UserWindowController>: |
| 91 void Create(mojo::Connection* connection, | 92 void Create(mojo::Connection* connection, |
| 92 mojo::InterfaceRequest<mash::wm::mojom::UserWindowController> | 93 mojo::InterfaceRequest<mash::wm::mojom::UserWindowController> |
| 93 request) override; | 94 request) override; |
| 94 | 95 |
| 95 // InterfaceFactory<mus::mojom::AcceleratorRegistrar>: | 96 // InterfaceFactory<mus::mojom::AcceleratorRegistrar>: |
| 96 void Create(mojo::Connection* connection, | 97 void Create(mojo::Connection* connection, |
| 97 mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request) | 98 mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request) |
| 98 override; | 99 override; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 128 | 129 |
| 129 base::ObserverList<RootWindowsObserver> root_windows_observers_; | 130 base::ObserverList<RootWindowsObserver> root_windows_observers_; |
| 130 | 131 |
| 131 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 132 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 132 }; | 133 }; |
| 133 | 134 |
| 134 } // namespace wm | 135 } // namespace wm |
| 135 } // namespace mash | 136 } // namespace mash |
| 136 | 137 |
| 137 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 138 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |