| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 111 |
| 112 void MusDemo::OnLostConnection(aura::WindowTreeClient* client) { | 112 void MusDemo::OnLostConnection(aura::WindowTreeClient* client) { |
| 113 root_window_ = nullptr; | 113 root_window_ = nullptr; |
| 114 window_tree_client_.reset(); | 114 window_tree_client_.reset(); |
| 115 timer_.Stop(); | 115 timer_.Stop(); |
| 116 } | 116 } |
| 117 | 117 |
| 118 void MusDemo::OnPointerEventObserved(const PointerEvent& event, | 118 void MusDemo::OnPointerEventObserved(const PointerEvent& event, |
| 119 aura::Window* target) {} | 119 aura::Window* target) {} |
| 120 | 120 |
| 121 aura::client::CaptureClient* MusDemo::GetCaptureClient() { |
| 122 return capture_client_.get(); |
| 123 } |
| 124 |
| 121 aura::PropertyConverter* MusDemo::GetPropertyConverter() { | 125 aura::PropertyConverter* MusDemo::GetPropertyConverter() { |
| 122 return property_converter_.get(); | 126 return property_converter_.get(); |
| 123 } | 127 } |
| 124 | 128 |
| 125 void MusDemo::SetWindowManagerClient(aura::WindowManagerClient* client) {} | 129 void MusDemo::SetWindowManagerClient(aura::WindowManagerClient* client) {} |
| 126 | 130 |
| 127 bool MusDemo::OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) { | 131 bool MusDemo::OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) { |
| 128 return true; | 132 return true; |
| 129 } | 133 } |
| 130 | 134 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 gfx::ImageSkiaRep image_skia_rep(bitmap, 1); | 244 gfx::ImageSkiaRep image_skia_rep(bitmap, 1); |
| 241 gfx::ImageSkia image_skia(image_skia_rep); | 245 gfx::ImageSkia image_skia(image_skia_rep); |
| 242 gfx::Image image(image_skia); | 246 gfx::Image image(image_skia); |
| 243 | 247 |
| 244 window_delegate_->SetImage(image); | 248 window_delegate_->SetImage(image); |
| 245 bitmap_window_->SchedulePaintInRect(bitmap_window_->bounds()); | 249 bitmap_window_->SchedulePaintInRect(bitmap_window_->bounds()); |
| 246 } | 250 } |
| 247 | 251 |
| 248 } // namespace demo | 252 } // namespace demo |
| 249 } // namespace aura | 253 } // namespace aura |
| OLD | NEW |