| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ui/aura/window_tree_host_platform.h" | 5 #include "ui/aura/window_tree_host_platform.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 8 #include "ui/aura/window_event_dispatcher.h" | 10 #include "ui/aura/window_event_dispatcher.h" |
| 9 #include "ui/compositor/compositor.h" | 11 #include "ui/compositor/compositor.h" |
| 10 #include "ui/events/event.h" | 12 #include "ui/events/event.h" |
| 11 #include "ui/gfx/screen.h" | 13 #include "ui/gfx/screen.h" |
| 12 | 14 |
| 13 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
| 14 #include "ui/platform_window/android/platform_window_android.h" | 16 #include "ui/platform_window/android/platform_window_android.h" |
| 15 #endif | 17 #endif |
| 16 | 18 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 } | 50 } |
| 49 | 51 |
| 50 WindowTreeHostPlatform::WindowTreeHostPlatform() | 52 WindowTreeHostPlatform::WindowTreeHostPlatform() |
| 51 : widget_(gfx::kNullAcceleratedWidget), | 53 : widget_(gfx::kNullAcceleratedWidget), |
| 52 current_cursor_(ui::kCursorNull) { | 54 current_cursor_(ui::kCursorNull) { |
| 53 CreateCompositor(); | 55 CreateCompositor(); |
| 54 } | 56 } |
| 55 | 57 |
| 56 void WindowTreeHostPlatform::SetPlatformWindow( | 58 void WindowTreeHostPlatform::SetPlatformWindow( |
| 57 scoped_ptr<ui::PlatformWindow> window) { | 59 scoped_ptr<ui::PlatformWindow> window) { |
| 58 window_ = window.Pass(); | 60 window_ = std::move(window); |
| 59 } | 61 } |
| 60 | 62 |
| 61 WindowTreeHostPlatform::~WindowTreeHostPlatform() { | 63 WindowTreeHostPlatform::~WindowTreeHostPlatform() { |
| 62 DestroyCompositor(); | 64 DestroyCompositor(); |
| 63 DestroyDispatcher(); | 65 DestroyDispatcher(); |
| 64 } | 66 } |
| 65 | 67 |
| 66 ui::EventSource* WindowTreeHostPlatform::GetEventSource() { | 68 ui::EventSource* WindowTreeHostPlatform::GetEventSource() { |
| 67 return this; | 69 return this; |
| 68 } | 70 } |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 DCHECK_EQ(widget, widget_); | 178 DCHECK_EQ(widget, widget_); |
| 177 widget_ = gfx::kNullAcceleratedWidget; | 179 widget_ = gfx::kNullAcceleratedWidget; |
| 178 } | 180 } |
| 179 | 181 |
| 180 void WindowTreeHostPlatform::OnActivationChanged(bool active) { | 182 void WindowTreeHostPlatform::OnActivationChanged(bool active) { |
| 181 if (active) | 183 if (active) |
| 182 OnHostActivated(); | 184 OnHostActivated(); |
| 183 } | 185 } |
| 184 | 186 |
| 185 } // namespace aura | 187 } // namespace aura |
| OLD | NEW |