| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_observer_hud.h" | 5 #include "ash/touch/touch_observer_hud.h" |
| 6 | 6 |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/root_window_settings.h" | 8 #include "ash/root_window_settings.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 void TouchObserverHUD::OnDisplayAdded(const gfx::Display& new_display) {} | 97 void TouchObserverHUD::OnDisplayAdded(const gfx::Display& new_display) {} |
| 98 | 98 |
| 99 void TouchObserverHUD::OnDisplayRemoved(const gfx::Display& old_display) { | 99 void TouchObserverHUD::OnDisplayRemoved(const gfx::Display& old_display) { |
| 100 if (old_display.id() != display_id_) | 100 if (old_display.id() != display_id_) |
| 101 return; | 101 return; |
| 102 widget_->CloseNow(); | 102 widget_->CloseNow(); |
| 103 } | 103 } |
| 104 | 104 |
| 105 #if defined(OS_CHROMEOS) | 105 #if defined(OS_CHROMEOS) |
| 106 void TouchObserverHUD::OnDisplayModeChanged( | 106 void TouchObserverHUD::OnDisplayModeChanged( |
| 107 const std::vector<ui::OutputConfigurator::OutputSnapshot>& outputs) { | 107 const ui::OutputConfigurator::DisplayStateList& outputs) { |
| 108 // Clear touch HUD for any change in display mode (single, dual extended, dual | 108 // Clear touch HUD for any change in display mode (single, dual extended, dual |
| 109 // mirrored, ...). | 109 // mirrored, ...). |
| 110 Clear(); | 110 Clear(); |
| 111 } | 111 } |
| 112 #endif // defined(OS_CHROMEOS) | 112 #endif // defined(OS_CHROMEOS) |
| 113 | 113 |
| 114 void TouchObserverHUD::OnDisplaysInitialized() { | 114 void TouchObserverHUD::OnDisplaysInitialized() { |
| 115 OnDisplayConfigurationChanged(); | 115 OnDisplayConfigurationChanged(); |
| 116 } | 116 } |
| 117 | 117 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 145 internal::kShellWindowId_OverlayContainer)); | 145 internal::kShellWindowId_OverlayContainer)); |
| 146 | 146 |
| 147 RootWindowController* controller = GetRootWindowController(root_window_); | 147 RootWindowController* controller = GetRootWindowController(root_window_); |
| 148 SetHudForRootWindowController(controller); | 148 SetHudForRootWindowController(controller); |
| 149 | 149 |
| 150 root_window_->AddPreTargetHandler(this); | 150 root_window_->AddPreTargetHandler(this); |
| 151 } | 151 } |
| 152 | 152 |
| 153 } // namespace internal | 153 } // namespace internal |
| 154 } // namespace ash | 154 } // namespace ash |
| OLD | NEW |