| 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/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
| 8 #include "ash/public/cpp/config.h" | 8 #include "ash/public/cpp/config.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_port.h" | 10 #include "ash/shell_port.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 | 53 |
| 54 //////////////////////////////////////////////////////////////////////////////// | 54 //////////////////////////////////////////////////////////////////////////////// |
| 55 // WMHelperAsh, private: | 55 // WMHelperAsh, private: |
| 56 | 56 |
| 57 const display::ManagedDisplayInfo WMHelperAsh::GetDisplayInfo( | 57 const display::ManagedDisplayInfo WMHelperAsh::GetDisplayInfo( |
| 58 int64_t display_id) const { | 58 int64_t display_id) const { |
| 59 return ash::Shell::Get()->display_manager()->GetDisplayInfo(display_id); | 59 return ash::Shell::Get()->display_manager()->GetDisplayInfo(display_id); |
| 60 } | 60 } |
| 61 | 61 |
| 62 aura::Window* WMHelperAsh::GetContainer(int container_id) { | 62 aura::Window* WMHelperAsh::GetContainer(int container_id) { |
| 63 return ash::Shell::GetContainer(ash::Shell::GetRootWindowForNewWindows(), | 63 // TODO(domlaskowski): Use target root window once multi-display support lands |
| 64 // in ARC. See crbug.com/718627. |
| 65 return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), |
| 64 container_id); | 66 container_id); |
| 65 } | 67 } |
| 66 | 68 |
| 67 aura::Window* WMHelperAsh::GetActiveWindow() const { | 69 aura::Window* WMHelperAsh::GetActiveWindow() const { |
| 68 return ash::Shell::Get()->activation_client()->GetActiveWindow(); | 70 return ash::Shell::Get()->activation_client()->GetActiveWindow(); |
| 69 } | 71 } |
| 70 | 72 |
| 71 aura::Window* WMHelperAsh::GetFocusedWindow() const { | 73 aura::Window* WMHelperAsh::GetFocusedWindow() const { |
| 72 aura::client::FocusClient* focus_client = | 74 aura::client::FocusClient* focus_client = |
| 73 aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow()); | 75 aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow()); |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 156 |
| 155 void WMHelperAsh::OnDisplayConfigurationChanged() { | 157 void WMHelperAsh::OnDisplayConfigurationChanged() { |
| 156 NotifyDisplayConfigurationChanged(); | 158 NotifyDisplayConfigurationChanged(); |
| 157 } | 159 } |
| 158 | 160 |
| 159 void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() { | 161 void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() { |
| 160 NotifyKeyboardDeviceConfigurationChanged(); | 162 NotifyKeyboardDeviceConfigurationChanged(); |
| 161 } | 163 } |
| 162 | 164 |
| 163 } // namespace exo | 165 } // namespace exo |
| OLD | NEW |