| 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 SERVICES_UI_DEMO_MUS_DEMO_H_ | 5 #ifndef SERVICES_UI_DEMO_MUS_DEMO_H_ |
| 6 #define SERVICES_UI_DEMO_MUS_DEMO_H_ | 6 #define SERVICES_UI_DEMO_MUS_DEMO_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 service_manager::InterfaceRegistry* registry) override; | 57 service_manager::InterfaceRegistry* registry) override; |
| 58 | 58 |
| 59 // aura::WindowTreeClientDelegate: | 59 // aura::WindowTreeClientDelegate: |
| 60 void OnEmbed( | 60 void OnEmbed( |
| 61 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; | 61 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; |
| 62 void OnUnembed(aura::Window* root) override; | 62 void OnUnembed(aura::Window* root) override; |
| 63 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; | 63 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; |
| 64 void OnLostConnection(aura::WindowTreeClient* client) override; | 64 void OnLostConnection(aura::WindowTreeClient* client) override; |
| 65 void OnPointerEventObserved(const ui::PointerEvent& event, | 65 void OnPointerEventObserved(const ui::PointerEvent& event, |
| 66 aura::Window* target) override; | 66 aura::Window* target) override; |
| 67 aura::client::CaptureClient* GetCaptureClient() override; |
| 67 aura::PropertyConverter* GetPropertyConverter() override; | 68 aura::PropertyConverter* GetPropertyConverter() override; |
| 68 | 69 |
| 69 // aura::WindowManagerDelegate: | 70 // aura::WindowManagerDelegate: |
| 70 void SetWindowManagerClient(aura::WindowManagerClient* client) override; | 71 void SetWindowManagerClient(aura::WindowManagerClient* client) override; |
| 71 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; | 72 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; |
| 72 bool OnWmSetProperty( | 73 bool OnWmSetProperty( |
| 73 aura::Window* window, | 74 aura::Window* window, |
| 74 const std::string& name, | 75 const std::string& name, |
| 75 std::unique_ptr<std::vector<uint8_t>>* new_data) override; | 76 std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
| 76 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; | 77 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 // Last time a frame was drawn. | 127 // Last time a frame was drawn. |
| 127 base::TimeTicks last_draw_frame_time_; | 128 base::TimeTicks last_draw_frame_time_; |
| 128 | 129 |
| 129 DISALLOW_COPY_AND_ASSIGN(MusDemo); | 130 DISALLOW_COPY_AND_ASSIGN(MusDemo); |
| 130 }; | 131 }; |
| 131 | 132 |
| 132 } // namespace demo | 133 } // namespace demo |
| 133 } // namespace aura | 134 } // namespace aura |
| 134 | 135 |
| 135 #endif // SERVICES_UI_DEMO_MUS_DEMO_H_ | 136 #endif // SERVICES_UI_DEMO_MUS_DEMO_H_ |
| OLD | NEW |