| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 COMPONENTS_MUS_DEMO_MUS_DEMO_H_ | 5 #ifndef COMPONENTS_MUS_DEMO_MUS_DEMO_H_ |
| 6 #define COMPONENTS_MUS_DEMO_MUS_DEMO_H_ | 6 #define COMPONENTS_MUS_DEMO_MUS_DEMO_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 // shell::ShellClient: | 42 // shell::ShellClient: |
| 43 void Initialize(shell::Connector* connector, | 43 void Initialize(shell::Connector* connector, |
| 44 const shell::Identity& identity, | 44 const shell::Identity& identity, |
| 45 uint32_t id) override; | 45 uint32_t id) override; |
| 46 bool AcceptConnection(shell::Connection* connection) override; | 46 bool AcceptConnection(shell::Connection* connection) override; |
| 47 | 47 |
| 48 // WindowTreeDelegate: | 48 // WindowTreeDelegate: |
| 49 void OnEmbed(mus::Window* root) override; | 49 void OnEmbed(mus::Window* root) override; |
| 50 void OnUnembed(mus::Window* root) override; | 50 void OnUnembed(mus::Window* root) override; |
| 51 void OnConnectionLost(mus::WindowTreeConnection* connection) override; | 51 void OnConnectionLost(mus::WindowTreeConnection* connection) override; |
| 52 void OnEventObserved(const ui::Event& event) override; |
| 52 | 53 |
| 53 // WindowManagerDelegate: | 54 // WindowManagerDelegate: |
| 54 void SetWindowManagerClient(mus::WindowManagerClient* client) override; | 55 void SetWindowManagerClient(mus::WindowManagerClient* client) override; |
| 55 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override; | 56 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override; |
| 56 bool OnWmSetProperty( | 57 bool OnWmSetProperty( |
| 57 mus::Window* window, | 58 mus::Window* window, |
| 58 const std::string& name, | 59 const std::string& name, |
| 59 std::unique_ptr<std::vector<uint8_t>>* new_data) override; | 60 std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
| 60 mus::Window* OnWmCreateTopLevelWindow( | 61 mus::Window* OnWmCreateTopLevelWindow( |
| 61 std::map<std::string, std::vector<uint8_t>>* properties) override; | 62 std::map<std::string, std::vector<uint8_t>>* properties) override; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 83 | 84 |
| 84 // Current rotation angle for drawing. | 85 // Current rotation angle for drawing. |
| 85 double angle_ = 0.0; | 86 double angle_ = 0.0; |
| 86 | 87 |
| 87 DISALLOW_COPY_AND_ASSIGN(MusDemo); | 88 DISALLOW_COPY_AND_ASSIGN(MusDemo); |
| 88 }; | 89 }; |
| 89 | 90 |
| 90 } // namespace mus_demo | 91 } // namespace mus_demo |
| 91 | 92 |
| 92 #endif // COMPONENTS_MUS_DEMO_MUS_DEMO_H_ | 93 #endif // COMPONENTS_MUS_DEMO_MUS_DEMO_H_ |
| OLD | NEW |