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

Unified Diff: ui/ozone/platform/dri/ozone_platform_dri.cc

Issue 611423002: [WIP][Ozone] Support external touchscreens (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ozone-touchscreen
Patch Set: . Created 6 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/ozone/platform/dri/native_display_delegate_proxy.cc ('k') | ui/ozone/platform/dri/ozone_platform_gbm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/dri/ozone_platform_dri.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/dri/ozone_platform_dri.cc
index 63750e274b857950671a098d740aeac93188caeb..a608e634f5bdb0707cdb8acc501c5739cfbfcd50 100644
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc
+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc
@@ -9,6 +9,7 @@
#include "ui/events/ozone/device/device_manager.h"
#include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
+#include "ui/ozone/platform/dri/display_manager.h"
#include "ui/ozone/platform/dri/dri_buffer.h"
#include "ui/ozone/platform/dri/dri_cursor.h"
#include "ui/ozone/platform/dri/dri_gpu_platform_support.h"
@@ -70,7 +71,8 @@ class OzonePlatformDri : public OzonePlatform {
bounds,
gpu_platform_support_host_.get(),
event_factory_ozone_.get(),
- window_manager_.get()));
+ window_manager_.get(),
+ display_manager_.get()));
platform_window->Initialize();
return platform_window.Pass();
}
@@ -81,6 +83,7 @@ class OzonePlatformDri : public OzonePlatform {
}
virtual void InitializeUI() override {
dri_->Initialize();
+ display_manager_.reset(new DisplayManager());
surface_factory_ozone_.reset(new DriSurfaceFactory(
dri_.get(), screen_manager_.get(), &window_delegate_manager_));
gpu_platform_support_.reset(
@@ -115,6 +118,7 @@ class OzonePlatformDri : public OzonePlatform {
scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
scoped_ptr<DriWindowManager> window_manager_;
+ scoped_ptr<DisplayManager> display_manager_;
scoped_ptr<DriGpuPlatformSupport> gpu_platform_support_;
scoped_ptr<DriGpuPlatformSupportHost> gpu_platform_support_host_;
« no previous file with comments | « ui/ozone/platform/dri/native_display_delegate_proxy.cc ('k') | ui/ozone/platform/dri/ozone_platform_gbm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698