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_H_ | 5 #ifndef MASH_WM_WINDOW_MANAGER_H_ |
6 #define MASH_WM_WINDOW_MANAGER_H_ | 6 #define MASH_WM_WINDOW_MANAGER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 void OnWindowEmbeddedAppDisconnected(mus::Window* window) override; | 46 void OnWindowEmbeddedAppDisconnected(mus::Window* window) override; |
47 | 47 |
48 // WindowManagerDelegate: | 48 // WindowManagerDelegate: |
49 void SetWindowManagerClient(mus::WindowManagerClient* client) override; | 49 void SetWindowManagerClient(mus::WindowManagerClient* client) override; |
50 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override; | 50 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override; |
51 bool OnWmSetProperty(mus::Window* window, | 51 bool OnWmSetProperty(mus::Window* window, |
52 const std::string& name, | 52 const std::string& name, |
53 scoped_ptr<std::vector<uint8_t>>* new_data) override; | 53 scoped_ptr<std::vector<uint8_t>>* new_data) override; |
54 mus::Window* OnWmCreateTopLevelWindow( | 54 mus::Window* OnWmCreateTopLevelWindow( |
55 std::map<std::string, std::vector<uint8_t>>* properties) override; | 55 std::map<std::string, std::vector<uint8_t>>* properties) override; |
56 void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override; | 56 void OnAccelerator(uint32_t id, const ui::Event& event) override; |
57 | 57 |
58 // mash::shell::mojom::ScreenlockStateListener: | 58 // mash::shell::mojom::ScreenlockStateListener: |
59 void ScreenlockStateChanged(bool locked) override; | 59 void ScreenlockStateChanged(bool locked) override; |
60 | 60 |
61 RootWindowController* root_controller_; | 61 RootWindowController* root_controller_; |
62 mus::WindowManagerClient* window_manager_client_; | 62 mus::WindowManagerClient* window_manager_client_; |
63 | 63 |
64 mojo::Binding<mash::shell::mojom::ScreenlockStateListener> binding_; | 64 mojo::Binding<mash::shell::mojom::ScreenlockStateListener> binding_; |
65 | 65 |
66 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 66 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
67 }; | 67 }; |
68 | 68 |
69 } // namespace wm | 69 } // namespace wm |
70 } // namespace mash | 70 } // namespace mash |
71 | 71 |
72 #endif // MASH_WM_WINDOW_MANAGER_H_ | 72 #endif // MASH_WM_WINDOW_MANAGER_H_ |
OLD | NEW |