Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: ash/aura/wm_shell_aura.cc

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/wm_shell_aura.h" 5 #include "ash/aura/wm_shell_aura.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/aura/pointer_watcher_adapter.h" 9 #include "ash/aura/pointer_watcher_adapter.h"
10 #include "ash/aura/wm_window_aura.h" 10 #include "ash/aura/wm_window_aura.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 WmWindow* WmShellAura::GetPrimaryRootWindow() { 100 WmWindow* WmShellAura::GetPrimaryRootWindow() {
101 return WmWindowAura::Get(Shell::GetPrimaryRootWindow()); 101 return WmWindowAura::Get(Shell::GetPrimaryRootWindow());
102 } 102 }
103 103
104 WmWindow* WmShellAura::GetRootWindowForDisplayId(int64_t display_id) { 104 WmWindow* WmShellAura::GetRootWindowForDisplayId(int64_t display_id) {
105 return WmWindowAura::Get(Shell::GetInstance() 105 return WmWindowAura::Get(Shell::GetInstance()
106 ->window_tree_host_manager() 106 ->window_tree_host_manager()
107 ->GetRootWindowForDisplayId(display_id)); 107 ->GetRootWindowForDisplayId(display_id));
108 } 108 }
109 109
110 const DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const { 110 const ui::DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const {
111 return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id); 111 return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id);
112 } 112 }
113 113
114 bool WmShellAura::IsActiveDisplayId(int64_t display_id) const { 114 bool WmShellAura::IsActiveDisplayId(int64_t display_id) const {
115 return Shell::GetInstance()->display_manager()->IsActiveDisplayId(display_id); 115 return Shell::GetInstance()->display_manager()->IsActiveDisplayId(display_id);
116 } 116 }
117 117
118 display::Display WmShellAura::GetFirstDisplay() const { 118 display::Display WmShellAura::GetFirstDisplay() const {
119 return Shell::GetInstance() 119 return Shell::GetInstance()
120 ->display_manager() 120 ->display_manager()
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 300 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
301 OnDisplayConfigurationChanging()); 301 OnDisplayConfigurationChanging());
302 } 302 }
303 303
304 void WmShellAura::OnDisplayConfigurationChanged() { 304 void WmShellAura::OnDisplayConfigurationChanged() {
305 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 305 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
306 OnDisplayConfigurationChanged()); 306 OnDisplayConfigurationChanged());
307 } 307 }
308 308
309 } // namespace ash 309 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698