| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/touch/touch_transformer_controller.h" | 5 #include "ash/touch/touch_transformer_controller.h" |
| 6 | 6 |
| 7 #include "ash/display/display_manager.h" | 7 #include "ash/display/display_manager.h" |
| 8 #include "ash/display/window_tree_host_manager.h" | 8 #include "ash/display/window_tree_host_manager.h" |
| 9 #include "ash/host/ash_window_tree_host.h" | 9 #include "ash/host/ash_window_tree_host.h" |
| 10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "ui/aura/window_tree_host.h" | 12 #include "ui/aura/window_tree_host.h" |
| 13 #include "ui/display/chromeos/display_configurator.h" | 13 #include "ui/display/chromeos/display_configurator.h" |
| 14 #include "ui/display/manager/display_layout.h" | 14 #include "ui/display/manager/display_layout.h" |
| 15 #include "ui/display/types/display_snapshot.h" | 15 #include "ui/display/types/display_snapshot.h" |
| 16 #include "ui/events/devices/device_data_manager.h" | 16 #include "ui/events/devices/device_data_manager.h" |
| 17 | 17 |
| 18 namespace ash { | 18 namespace ash { |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 DisplayManager* GetDisplayManager() { | 22 DisplayManager* GetDisplayManager() { |
| 23 return Shell::GetInstance()->display_manager(); | 23 return Shell::GetInstance()->display_manager(); |
| 24 } | 24 } |
| 25 | 25 |
| 26 ui::TouchscreenDevice FindTouchscreenById(int id) { | 26 ui::TouchscreenDevice FindTouchscreenById(int id) { |
| 27 const std::vector<ui::TouchscreenDevice>& touchscreens = | 27 const std::vector<ui::TouchscreenDevice>& touchscreens = |
| 28 ui::DeviceDataManager::GetInstance()->touchscreen_devices(); | 28 ui::DeviceDataManager::GetInstance()->GetTouchscreenDevices(); |
| 29 for (const auto& touchscreen : touchscreens) { | 29 for (const auto& touchscreen : touchscreens) { |
| 30 if (touchscreen.id == id) | 30 if (touchscreen.id == id) |
| 31 return touchscreen; | 31 return touchscreen; |
| 32 } | 32 } |
| 33 | 33 |
| 34 return ui::TouchscreenDevice(); | 34 return ui::TouchscreenDevice(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 } // namespace | 37 } // namespace |
| 38 | 38 |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 | 223 |
| 224 void TouchTransformerController::OnDisplaysInitialized() { | 224 void TouchTransformerController::OnDisplaysInitialized() { |
| 225 UpdateTouchTransformer(); | 225 UpdateTouchTransformer(); |
| 226 } | 226 } |
| 227 | 227 |
| 228 void TouchTransformerController::OnDisplayConfigurationChanged() { | 228 void TouchTransformerController::OnDisplayConfigurationChanged() { |
| 229 UpdateTouchTransformer(); | 229 UpdateTouchTransformer(); |
| 230 } | 230 } |
| 231 | 231 |
| 232 } // namespace ash | 232 } // namespace ash |
| OLD | NEW |