| 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_controller.h" | 7 #include "ash/display/display_controller.h" |
| 8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 display1.touch_device_id(), | 175 display1.touch_device_id(), |
| 176 GetMirrorModeTouchTransformer(display1)); | 176 GetMirrorModeTouchTransformer(display1)); |
| 177 device_manager->UpdateTouchInfoForDisplay( | 177 device_manager->UpdateTouchInfoForDisplay( |
| 178 display2_id, | 178 display2_id, |
| 179 display2.touch_device_id(), | 179 display2.touch_device_id(), |
| 180 GetMirrorModeTouchTransformer(display2)); | 180 GetMirrorModeTouchTransformer(display2)); |
| 181 return; | 181 return; |
| 182 } | 182 } |
| 183 | 183 |
| 184 if (display_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED) { | 184 if (display_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED) { |
| 185 // TODO(miletus) : Handle the case the state is DUAL_EXTENDED but it |
| 186 // is actually doing software mirroring. |
| 187 if (GetDisplayManager()->software_mirroring_enabled()) |
| 188 return; |
| 185 // In extended mode, each display is associated with one root window. | 189 // In extended mode, each display is associated with one root window. |
| 186 aura::Window* root1 = | 190 aura::Window* root1 = |
| 187 display_controller->GetRootWindowForDisplayId(display1_id); | 191 display_controller->GetRootWindowForDisplayId(display1_id); |
| 188 aura::Window* root2 = | 192 aura::Window* root2 = |
| 189 display_controller->GetRootWindowForDisplayId(display2_id); | 193 display_controller->GetRootWindowForDisplayId(display2_id); |
| 190 RootWindowController::ForWindow(root1)->ash_host()->UpdateDisplayID( | 194 RootWindowController::ForWindow(root1)->ash_host()->UpdateDisplayID( |
| 191 display1_id, gfx::Display::kInvalidDisplayID); | 195 display1_id, gfx::Display::kInvalidDisplayID); |
| 192 RootWindowController::ForWindow(root2)->ash_host()->UpdateDisplayID( | 196 RootWindowController::ForWindow(root2)->ash_host()->UpdateDisplayID( |
| 193 display2_id, gfx::Display::kInvalidDisplayID); | 197 display2_id, gfx::Display::kInvalidDisplayID); |
| 194 gfx::Size fb_size = | 198 gfx::Size fb_size = |
| (...skipping 21 matching lines...) Expand all Loading... |
| 216 | 220 |
| 217 void TouchTransformerController::OnDisplaysInitialized() { | 221 void TouchTransformerController::OnDisplaysInitialized() { |
| 218 UpdateTouchTransformer(); | 222 UpdateTouchTransformer(); |
| 219 } | 223 } |
| 220 | 224 |
| 221 void TouchTransformerController::OnDisplayConfigurationChanged() { | 225 void TouchTransformerController::OnDisplayConfigurationChanged() { |
| 222 UpdateTouchTransformer(); | 226 UpdateTouchTransformer(); |
| 223 } | 227 } |
| 224 | 228 |
| 225 } // namespace ash | 229 } // namespace ash |
| OLD | NEW |