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

Unified Diff: ash/shell.cc

Issue 2887413004: chromeos: moves setting of touch state to a separate class (Closed)
Patch Set: feedback Created 3 years, 7 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 | « no previous file | ash/touch/ash_touch_transform_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 8aa43b908db3b85648f97aa2a5bbf2e1829f5766..864802ad9feef8bb842d6f78656bb4b725c3c1fb 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -153,6 +153,7 @@
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animator.h"
#include "ui/display/display.h"
+#include "ui/display/manager/chromeos/default_touch_transform_setter.h"
#include "ui/display/manager/chromeos/display_change_observer.h"
#include "ui/display/manager/chromeos/display_configurator.h"
#include "ui/display/manager/display_manager.h"
@@ -1059,7 +1060,8 @@ void Shell::Init(const ShellInitParams& init_params) {
// TODO(sky): needs to to work for mus too.
if (config == Config::CLASSIC) {
touch_transformer_controller_.reset(new AshTouchTransformController(
- display_configurator_.get(), display_manager_.get()));
+ display_configurator_.get(), display_manager_.get(),
+ base::MakeUnique<display::DefaultTouchTransformSetter>()));
}
keyboard_ui_ = shell_port_->CreateKeyboardUI();
« no previous file with comments | « no previous file | ash/touch/ash_touch_transform_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698