| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/aura/shell_port_classic.h" | 5 #include "ash/aura/shell_port_classic.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
| 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" | 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 | 270 |
| 271 std::unique_ptr<AcceleratorController> | 271 std::unique_ptr<AcceleratorController> |
| 272 ShellPortClassic::CreateAcceleratorController() { | 272 ShellPortClassic::CreateAcceleratorController() { |
| 273 DCHECK(!accelerator_controller_delegate_); | 273 DCHECK(!accelerator_controller_delegate_); |
| 274 accelerator_controller_delegate_ = | 274 accelerator_controller_delegate_ = |
| 275 base::MakeUnique<AcceleratorControllerDelegateAura>(); | 275 base::MakeUnique<AcceleratorControllerDelegateAura>(); |
| 276 return base::MakeUnique<AcceleratorController>( | 276 return base::MakeUnique<AcceleratorController>( |
| 277 accelerator_controller_delegate_.get(), nullptr); | 277 accelerator_controller_delegate_.get(), nullptr); |
| 278 } | 278 } |
| 279 | 279 |
| 280 void ShellPortClassic::OnCreatedRootWindowContainers( |
| 281 RootWindowController* root_window_controller) {} |
| 282 |
| 280 void ShellPortClassic::OnDisplayConfigurationChanging() { | 283 void ShellPortClassic::OnDisplayConfigurationChanging() { |
| 281 for (auto& observer : display_observers_) | 284 for (auto& observer : display_observers_) |
| 282 observer.OnDisplayConfigurationChanging(); | 285 observer.OnDisplayConfigurationChanging(); |
| 283 } | 286 } |
| 284 | 287 |
| 285 void ShellPortClassic::OnDisplayConfigurationChanged() { | 288 void ShellPortClassic::OnDisplayConfigurationChanged() { |
| 286 for (auto& observer : display_observers_) | 289 for (auto& observer : display_observers_) |
| 287 observer.OnDisplayConfigurationChanged(); | 290 observer.OnDisplayConfigurationChanged(); |
| 288 } | 291 } |
| 289 | 292 |
| 290 } // namespace ash | 293 } // namespace ash |
| OLD | NEW |