| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 #include "services/ui/demo/mus_demo_internal.h" | 5 #include "services/ui/demo/mus_demo_internal.h" |
| 6 | 6 |
| 7 #include "services/service_manager/public/cpp/service_context.h" | 7 #include "services/service_manager/public/cpp/service_context.h" |
| 8 #include "services/ui/demo/window_tree_data.h" | 8 #include "services/ui/demo/window_tree_data.h" |
| 9 #include "ui/aura/mus/window_tree_client.h" | 9 #include "ui/aura/mus/window_tree_client.h" |
| 10 #include "ui/aura/mus/window_tree_host_mus.h" | 10 #include "ui/aura/mus/window_tree_host_mus.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 void MusDemoInternal::OnStartImpl() { | 31 void MusDemoInternal::OnStartImpl() { |
| 32 window_tree_client()->ConnectAsWindowManager(); | 32 window_tree_client()->ConnectAsWindowManager(); |
| 33 // The demo will actually start when the window server creates the display, | 33 // The demo will actually start when the window server creates the display, |
| 34 // causing OnWmNewDisplay to be called. | 34 // causing OnWmNewDisplay to be called. |
| 35 } | 35 } |
| 36 | 36 |
| 37 void MusDemoInternal::SetWindowManagerClient( | 37 void MusDemoInternal::SetWindowManagerClient( |
| 38 aura::WindowManagerClient* client) {} | 38 aura::WindowManagerClient* client) {} |
| 39 | 39 |
| 40 bool MusDemoInternal::OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) { | 40 void MusDemoInternal::OnWmSetBounds(aura::Window* window, |
| 41 return true; | 41 const gfx::Rect& bounds) {} |
| 42 } | |
| 43 | 42 |
| 44 bool MusDemoInternal::OnWmSetProperty( | 43 bool MusDemoInternal::OnWmSetProperty( |
| 45 aura::Window* window, | 44 aura::Window* window, |
| 46 const std::string& name, | 45 const std::string& name, |
| 47 std::unique_ptr<std::vector<uint8_t>>* new_data) { | 46 std::unique_ptr<std::vector<uint8_t>>* new_data) { |
| 48 return true; | 47 return true; |
| 49 } | 48 } |
| 50 | 49 |
| 51 void MusDemoInternal::OnWmSetModalType(aura::Window* window, ModalType type) {} | 50 void MusDemoInternal::OnWmSetModalType(aura::Window* window, ModalType type) {} |
| 52 | 51 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 const std::vector<gfx::Rect>& additional_client_areas) {} | 114 const std::vector<gfx::Rect>& additional_client_areas) {} |
| 116 | 115 |
| 117 bool MusDemoInternal::IsWindowActive(aura::Window* window) { | 116 bool MusDemoInternal::IsWindowActive(aura::Window* window) { |
| 118 return false; | 117 return false; |
| 119 } | 118 } |
| 120 | 119 |
| 121 void MusDemoInternal::OnWmDeactivateWindow(aura::Window* window) {} | 120 void MusDemoInternal::OnWmDeactivateWindow(aura::Window* window) {} |
| 122 | 121 |
| 123 } // namespace demo | 122 } // namespace demo |
| 124 } // namespace ui | 123 } // namespace ui |
| OLD | NEW |