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

Unified Diff: ash/shell.cc

Issue 2617043003: Move TouchTransformerController to ui/display/. (Closed)
Patch Set: Make DEPS for one file. 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 | « ash/shell.h ('k') | 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 4c3106f4ea53d9c2c88e9621388f48759c117e2c..7ad6e10e0fe0ebc2ee65e47ae66fee74cec26931 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -71,7 +71,7 @@
#include "ash/system/chromeos/power/power_event_observer.h"
#include "ash/system/chromeos/power/video_activity_notifier.h"
#include "ash/system/chromeos/screen_layout_observer.h"
-#include "ash/touch/touch_transformer_controller.h"
+#include "ash/touch/ash_touch_transform_controller.h"
#include "ash/utility/screenshot_controller.h"
#include "ash/virtual_keyboard_controller.h"
#include "ash/wm/ash_focus_rules.h"
@@ -742,11 +742,12 @@ void Shell::Init(const ShellInitParams& init_params) {
wm_shell_->SetSystemTrayDelegate(
base::WrapUnique(wm_shell_->delegate()->CreateSystemTrayDelegate()));
- // Create TouchTransformerController before
+ // Create AshTouchTransformController before
// WindowTreeHostManager::InitDisplays()
- // since TouchTransformerController listens on
+ // since AshTouchTransformController listens on
// WindowTreeHostManager::Observer::OnDisplaysInitialized().
- touch_transformer_controller_.reset(new TouchTransformerController());
+ touch_transformer_controller_.reset(new AshTouchTransformController(
+ display_configurator_.get(), display_manager_.get()));
wm_shell_->SetKeyboardUI(KeyboardUI::Create());
« no previous file with comments | « ash/shell.h ('k') | ash/touch/ash_touch_transform_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698