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

Unified Diff: ash/shell.cc

Issue 2887413004: chromeos: moves setting of touch state to a separate class (Closed)
Patch Set: merge 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 7395803e4ee6026652fdd02dbdd52d04adc1ed1e..d8f6ee89fbbc9e085c208d0f10d51d4a50f310d1 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -152,6 +152,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"
@@ -1054,7 +1055,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') | ui/display/manager/chromeos/touch_transform_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698