Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: ui/aura/window_tree_host_platform.cc

Issue 2446893005: Adds a porting layer so aura can be made to work with mus (Closed)
Patch Set: better Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/window_tree_host_platform.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_tree_host_platform.cc
diff --git a/ui/aura/window_tree_host_platform.cc b/ui/aura/window_tree_host_platform.cc
index 02bb8f76327660616e217cfdd864e82adba25e36..6233739abb039134a68f72c3f65f73f0801a128e 100644
--- a/ui/aura/window_tree_host_platform.cc
+++ b/ui/aura/window_tree_host_platform.cc
@@ -9,6 +9,7 @@
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_port.h"
#include "ui/compositor/compositor.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
@@ -52,7 +53,12 @@ WindowTreeHostPlatform::WindowTreeHostPlatform(const gfx::Rect& bounds)
}
WindowTreeHostPlatform::WindowTreeHostPlatform()
- : widget_(gfx::kNullAcceleratedWidget),
+ : WindowTreeHostPlatform(nullptr) {}
+
+WindowTreeHostPlatform::WindowTreeHostPlatform(
+ std::unique_ptr<WindowPort> window_port)
+ : WindowTreeHost(std::move(window_port)),
+ widget_(gfx::kNullAcceleratedWidget),
current_cursor_(ui::kCursorNull) {
CreateCompositor();
}
« no previous file with comments | « ui/aura/window_tree_host_platform.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698