| 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 #include "services/ui/demo/mus_demo.h" | 5 #include "services/ui/demo/mus_demo.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
| 9 #include "services/service_manager/public/cpp/connector.h" | 9 #include "services/service_manager/public/cpp/connector.h" |
| 10 #include "services/service_manager/public/cpp/service_context.h" | 10 #include "services/service_manager/public/cpp/service_context.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 window_ = nullptr; | 93 window_ = nullptr; |
| 94 window_tree_client_.reset(); | 94 window_tree_client_.reset(); |
| 95 timer_.Stop(); | 95 timer_.Stop(); |
| 96 } | 96 } |
| 97 | 97 |
| 98 void MusDemo::OnPointerEventObserved(const PointerEvent& event, | 98 void MusDemo::OnPointerEventObserved(const PointerEvent& event, |
| 99 Window* target) {} | 99 Window* target) {} |
| 100 | 100 |
| 101 void MusDemo::SetWindowManagerClient(WindowManagerClient* client) {} | 101 void MusDemo::SetWindowManagerClient(WindowManagerClient* client) {} |
| 102 | 102 |
| 103 bool MusDemo::OnWmSetBounds(Window* window, gfx::Rect* bounds) { | 103 void MusDemo::OnWmSetBounds(Window* window, gfx::Rect* bounds) {} |
| 104 return true; | |
| 105 } | |
| 106 | 104 |
| 107 bool MusDemo::OnWmSetProperty(Window* window, | 105 bool MusDemo::OnWmSetProperty(Window* window, |
| 108 const std::string& name, | 106 const std::string& name, |
| 109 std::unique_ptr<std::vector<uint8_t>>* new_data) { | 107 std::unique_ptr<std::vector<uint8_t>>* new_data) { |
| 110 return true; | 108 return true; |
| 111 } | 109 } |
| 112 | 110 |
| 113 Window* MusDemo::OnWmCreateTopLevelWindow( | 111 Window* MusDemo::OnWmCreateTopLevelWindow( |
| 114 std::map<std::string, std::vector<uint8_t>>* properties) { | 112 std::map<std::string, std::vector<uint8_t>>* properties) { |
| 115 return nullptr; | 113 return nullptr; |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 BitmapUploader::Format bitmap_format = BitmapUploader::BGRA; | 202 BitmapUploader::Format bitmap_format = BitmapUploader::BGRA; |
| 205 #endif | 203 #endif |
| 206 | 204 |
| 207 // Send frame to MUS via BitmapUploader. | 205 // Send frame to MUS via BitmapUploader. |
| 208 uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data), | 206 uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data), |
| 209 bitmap_format); | 207 bitmap_format); |
| 210 } | 208 } |
| 211 | 209 |
| 212 } // namespace demo | 210 } // namespace demo |
| 213 } // namespace ui | 211 } // namespace ui |
| OLD | NEW |