| 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 "components/exo/wm_helper_ash.h" | 5 #include "components/exo/wm_helper_ash.h" |
| 6 | 6 |
| 7 #include "ash/common/accessibility_delegate.h" | 7 #include "ash/common/accessibility_delegate.h" |
| 8 #include "ash/common/system/tray/system_tray_notifier.h" | 8 #include "ash/common/system/tray/system_tray_notifier.h" |
| 9 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 9 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 //////////////////////////////////////////////////////////////////////////////// | 46 //////////////////////////////////////////////////////////////////////////////// |
| 47 // WMHelperAsh, private: | 47 // WMHelperAsh, private: |
| 48 | 48 |
| 49 const display::ManagedDisplayInfo WMHelperAsh::GetDisplayInfo( | 49 const display::ManagedDisplayInfo WMHelperAsh::GetDisplayInfo( |
| 50 int64_t display_id) const { | 50 int64_t display_id) const { |
| 51 return ash::Shell::GetInstance()->display_manager()->GetDisplayInfo( | 51 return ash::Shell::GetInstance()->display_manager()->GetDisplayInfo( |
| 52 display_id); | 52 display_id); |
| 53 } | 53 } |
| 54 | 54 |
| 55 aura::Window* WMHelperAsh::GetContainer(int container_id) { | 55 aura::Window* WMHelperAsh::GetContainer(int container_id) { |
| 56 return ash::Shell::GetContainer(ash::Shell::GetTargetRootWindow(), | 56 return ash::Shell::GetContainer(ash::Shell::GetRootWindowForNewWindows(), |
| 57 container_id); | 57 container_id); |
| 58 } | 58 } |
| 59 | 59 |
| 60 aura::Window* WMHelperAsh::GetActiveWindow() const { | 60 aura::Window* WMHelperAsh::GetActiveWindow() const { |
| 61 return ash::Shell::GetInstance()->activation_client()->GetActiveWindow(); | 61 return ash::Shell::GetInstance()->activation_client()->GetActiveWindow(); |
| 62 } | 62 } |
| 63 | 63 |
| 64 aura::Window* WMHelperAsh::GetFocusedWindow() const { | 64 aura::Window* WMHelperAsh::GetFocusedWindow() const { |
| 65 aura::client::FocusClient* focus_client = | 65 aura::client::FocusClient* focus_client = |
| 66 aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow()); | 66 aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow()); |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 | 142 |
| 143 void WMHelperAsh::OnMaximizeModeEnded() { | 143 void WMHelperAsh::OnMaximizeModeEnded() { |
| 144 NotifyMaximizeModeEnded(); | 144 NotifyMaximizeModeEnded(); |
| 145 } | 145 } |
| 146 | 146 |
| 147 void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() { | 147 void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() { |
| 148 NotifyKeyboardDeviceConfigurationChanged(); | 148 NotifyKeyboardDeviceConfigurationChanged(); |
| 149 } | 149 } |
| 150 | 150 |
| 151 } // namespace exo | 151 } // namespace exo |
| OLD | NEW |