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

Unified Diff: services/ui/display/screen_manager_ozone.cc

Issue 2627623003: Add full touch support to mus. (Closed)
Patch Set: Fixes. Created 3 years, 11 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 | « services/ui/display/screen_manager_ozone.h ('k') | services/ui/service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/display/screen_manager_ozone.cc
diff --git a/services/ui/display/screen_manager_ozone.cc b/services/ui/display/screen_manager_ozone.cc
index e48d6a1e78243bc3b6d3025a0ad727da5aacf7d0..9a8a0412b5ed77e4f2398df55d545abae2bcf714 100644
--- a/services/ui/display/screen_manager_ozone.cc
+++ b/services/ui/display/screen_manager_ozone.cc
@@ -14,6 +14,7 @@
#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/display/manager/chromeos/display_change_observer.h"
+#include "ui/display/manager/chromeos/touch_transform_controller.h"
#include "ui/display/manager/display_layout_store.h"
#include "ui/display/manager/display_manager_utilities.h"
#include "ui/display/screen.h"
@@ -63,6 +64,8 @@ ScreenManagerOzone::~ScreenManagerOzone() {
// We are shutting down and don't want to make anymore display changes.
fake_display_controller_ = nullptr;
+ touch_transform_controller_.reset();
+
if (display_manager_)
display_manager_->RemoveObserver(this);
@@ -180,6 +183,9 @@ void ScreenManagerOzone::Init(ScreenManagerDelegate* delegate) {
// Perform initial configuration.
display_configurator_.Init(std::move(native_display_delegate_), false);
display_configurator_.ForceInitialConfigure(kChromeOsBootColor);
+
+ touch_transform_controller_ = base::MakeUnique<TouchTransformController>(
+ &display_configurator_, display_manager_.get());
}
void ScreenManagerOzone::RequestCloseDisplay(int64_t display_id) {
@@ -356,6 +362,8 @@ void ScreenManagerOzone::PostDisplayConfigurationChange(
}
}
+ touch_transform_controller_->UpdateTouchTransforms();
+
DVLOG(1) << "PostDisplayConfigurationChange";
}
« no previous file with comments | « services/ui/display/screen_manager_ozone.h ('k') | services/ui/service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698