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" |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 GetTouchTransform(target_display, touch_display, | 147 GetTouchTransform(target_display, touch_display, |
148 FindTouchscreenById(device_id), fb_size)); | 148 FindTouchscreenById(device_id), fb_size)); |
149 } | 149 } |
150 } | 150 } |
151 | 151 |
152 void TouchTransformerController::UpdateTouchTransformer() const { | 152 void TouchTransformerController::UpdateTouchTransformer() const { |
153 ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance(); | 153 ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance(); |
154 device_manager->ClearTouchDeviceAssociations(); | 154 device_manager->ClearTouchDeviceAssociations(); |
155 | 155 |
156 // Display IDs and DisplayInfo for mirror or extended mode. | 156 // Display IDs and DisplayInfo for mirror or extended mode. |
157 int64 display1_id = gfx::Display::kInvalidDisplayID; | 157 int64_t display1_id = gfx::Display::kInvalidDisplayID; |
158 int64 display2_id = gfx::Display::kInvalidDisplayID; | 158 int64_t display2_id = gfx::Display::kInvalidDisplayID; |
159 DisplayInfo display1; | 159 DisplayInfo display1; |
160 DisplayInfo display2; | 160 DisplayInfo display2; |
161 // Display ID and DisplayInfo for single display mode. | 161 // Display ID and DisplayInfo for single display mode. |
162 int64 single_display_id = gfx::Display::kInvalidDisplayID; | 162 int64_t single_display_id = gfx::Display::kInvalidDisplayID; |
163 DisplayInfo single_display; | 163 DisplayInfo single_display; |
164 | 164 |
165 WindowTreeHostManager* window_tree_host_manager = | 165 WindowTreeHostManager* window_tree_host_manager = |
166 Shell::GetInstance()->window_tree_host_manager(); | 166 Shell::GetInstance()->window_tree_host_manager(); |
167 DisplayManager* display_manager = GetDisplayManager(); | 167 DisplayManager* display_manager = GetDisplayManager(); |
168 if (display_manager->num_connected_displays() == 0) { | 168 if (display_manager->num_connected_displays() == 0) { |
169 return; | 169 return; |
170 } else if (display_manager->num_connected_displays() == 1 || | 170 } else if (display_manager->num_connected_displays() == 1 || |
171 display_manager->IsInUnifiedMode()) { | 171 display_manager->IsInUnifiedMode()) { |
172 single_display_id = display_manager->first_display_id(); | 172 single_display_id = display_manager->first_display_id(); |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 | 222 |
223 void TouchTransformerController::OnDisplaysInitialized() { | 223 void TouchTransformerController::OnDisplaysInitialized() { |
224 UpdateTouchTransformer(); | 224 UpdateTouchTransformer(); |
225 } | 225 } |
226 | 226 |
227 void TouchTransformerController::OnDisplayConfigurationChanged() { | 227 void TouchTransformerController::OnDisplayConfigurationChanged() { |
228 UpdateTouchTransformer(); | 228 UpdateTouchTransformer(); |
229 } | 229 } |
230 | 230 |
231 } // namespace ash | 231 } // namespace ash |
OLD | NEW |