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

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

Issue 2627623003: Add full touch support to mus. (Closed)
Patch Set: 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
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..a5a12927c495659f7d583fc596bc9bc8b0bfcb69 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,9 @@ ScreenManagerOzone::~ScreenManagerOzone() {
// We are shutting down and don't want to make anymore display changes.
fake_display_controller_ = nullptr;
+ if (touch_transform_controller_)
msw 2017/01/10 19:43:27 optional nit: check is not necessary
kylechar 2017/01/10 22:12:18 Done.
+ touch_transform_controller_.reset();
+
if (display_manager_)
display_manager_->RemoveObserver(this);
@@ -180,6 +184,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>(
msw 2017/01/10 19:43:27 I don't get results for TouchTransformController i
kylechar 2017/01/10 22:12:18 The current class is ash::TouchTransformerControll
msw 2017/01/10 22:36:57 Acknowledged; thanks for pointing out the change d
+ &display_configurator_, display_manager_.get());
}
void ScreenManagerOzone::RequestCloseDisplay(int64_t display_id) {
@@ -356,6 +363,9 @@ void ScreenManagerOzone::PostDisplayConfigurationChange(
}
}
+ if (touch_transform_controller_)
msw 2017/01/10 19:43:27 q: does this ever happen before init or after rese
kylechar 2017/01/10 22:12:18 It shouldn't, only if someone changed the order in
+ touch_transform_controller_->UpdateTouchTransforms();
+
DVLOG(1) << "PostDisplayConfigurationChange";
}

Powered by Google App Engine
This is Rietveld 408576698