| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 return session_.get(); | 83 return session_.get(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 private: | 86 private: |
| 87 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar); | 87 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar); |
| 88 | 88 |
| 89 // mojo::ShellClient: | 89 // mojo::ShellClient: |
| 90 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, | 90 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, |
| 91 uint32_t id) override; | 91 uint32_t id) override; |
| 92 bool AcceptConnection(mojo::Connection* connection) override; | 92 bool AcceptConnection(mojo::Connection* connection) override; |
| 93 void ShellConnectionLost() override; |
| 93 | 94 |
| 94 // InterfaceFactory<mash::wm::mojom::UserWindowController>: | 95 // InterfaceFactory<mash::wm::mojom::UserWindowController>: |
| 95 void Create(mojo::Connection* connection, | 96 void Create(mojo::Connection* connection, |
| 96 mojo::InterfaceRequest<mash::wm::mojom::UserWindowController> | 97 mojo::InterfaceRequest<mash::wm::mojom::UserWindowController> |
| 97 request) override; | 98 request) override; |
| 98 | 99 |
| 99 // InterfaceFactory<mus::mojom::AcceleratorRegistrar>: | 100 // InterfaceFactory<mus::mojom::AcceleratorRegistrar>: |
| 100 void Create(mojo::Connection* connection, | 101 void Create(mojo::Connection* connection, |
| 101 mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request) | 102 mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request) |
| 102 override; | 103 override; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 132 | 133 |
| 133 base::ObserverList<RootWindowsObserver> root_windows_observers_; | 134 base::ObserverList<RootWindowsObserver> root_windows_observers_; |
| 134 | 135 |
| 135 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 136 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 136 }; | 137 }; |
| 137 | 138 |
| 138 } // namespace wm | 139 } // namespace wm |
| 139 } // namespace mash | 140 } // namespace mash |
| 140 | 141 |
| 141 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 142 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |