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/wm/maximize_mode/maximize_mode_controller.h" | 7 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
8 #include "ash/common/wm_shell.h" | 8 #include "ash/common/wm_shell.h" |
9 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 aura::client::FocusClient* focus_client = | 31 aura::client::FocusClient* focus_client = |
32 aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow()); | 32 aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow()); |
33 focus_client->RemoveObserver(this); | 33 focus_client->RemoveObserver(this); |
34 ash::Shell::GetInstance()->activation_client()->RemoveObserver(this); | 34 ash::Shell::GetInstance()->activation_client()->RemoveObserver(this); |
35 ash::WmShell::Get()->RemoveShellObserver(this); | 35 ash::WmShell::Get()->RemoveShellObserver(this); |
36 } | 36 } |
37 | 37 |
38 //////////////////////////////////////////////////////////////////////////////// | 38 //////////////////////////////////////////////////////////////////////////////// |
39 // WMHelperAsh, private: | 39 // WMHelperAsh, private: |
40 | 40 |
41 const ash::DisplayInfo WMHelperAsh::GetDisplayInfo(int64_t display_id) const { | 41 const display::ManagedDisplayInfo WMHelperAsh::GetDisplayInfo( |
| 42 int64_t display_id) const { |
42 return ash::Shell::GetInstance()->display_manager()->GetDisplayInfo( | 43 return ash::Shell::GetInstance()->display_manager()->GetDisplayInfo( |
43 display_id); | 44 display_id); |
44 } | 45 } |
45 | 46 |
46 aura::Window* WMHelperAsh::GetContainer(int container_id) { | 47 aura::Window* WMHelperAsh::GetContainer(int container_id) { |
47 return ash::Shell::GetContainer(ash::Shell::GetTargetRootWindow(), | 48 return ash::Shell::GetContainer(ash::Shell::GetTargetRootWindow(), |
48 container_id); | 49 container_id); |
49 } | 50 } |
50 | 51 |
51 aura::Window* WMHelperAsh::GetActiveWindow() const { | 52 aura::Window* WMHelperAsh::GetActiveWindow() const { |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 | 111 |
111 void WMHelperAsh::OnMaximizeModeStarted() { | 112 void WMHelperAsh::OnMaximizeModeStarted() { |
112 NotifyMaximizeModeStarted(); | 113 NotifyMaximizeModeStarted(); |
113 } | 114 } |
114 | 115 |
115 void WMHelperAsh::OnMaximizeModeEnded() { | 116 void WMHelperAsh::OnMaximizeModeEnded() { |
116 NotifyMaximizeModeEnded(); | 117 NotifyMaximizeModeEnded(); |
117 } | 118 } |
118 | 119 |
119 } // namespace exo | 120 } // namespace exo |
OLD | NEW |