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

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, 3 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
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/display/display_info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 WmWindow* WmShellAura::GetPrimaryRootWindow() { 101 WmWindow* WmShellAura::GetPrimaryRootWindow() {
102 return WmWindowAura::Get(Shell::GetPrimaryRootWindow()); 102 return WmWindowAura::Get(Shell::GetPrimaryRootWindow());
103 } 103 }
104 104
105 WmWindow* WmShellAura::GetRootWindowForDisplayId(int64_t display_id) { 105 WmWindow* WmShellAura::GetRootWindowForDisplayId(int64_t display_id) {
106 return WmWindowAura::Get(Shell::GetInstance() 106 return WmWindowAura::Get(Shell::GetInstance()
107 ->window_tree_host_manager() 107 ->window_tree_host_manager()
108 ->GetRootWindowForDisplayId(display_id)); 108 ->GetRootWindowForDisplayId(display_id));
109 } 109 }
110 110
111 const DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const { 111 const display::ManagedDisplayInfo& WmShellAura::GetDisplayInfo(
112 int64_t display_id) const {
112 return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id); 113 return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id);
113 } 114 }
114 115
115 bool WmShellAura::IsActiveDisplayId(int64_t display_id) const { 116 bool WmShellAura::IsActiveDisplayId(int64_t display_id) const {
116 return Shell::GetInstance()->display_manager()->IsActiveDisplayId(display_id); 117 return Shell::GetInstance()->display_manager()->IsActiveDisplayId(display_id);
117 } 118 }
118 119
119 display::Display WmShellAura::GetFirstDisplay() const { 120 display::Display WmShellAura::GetFirstDisplay() const {
120 return Shell::GetInstance() 121 return Shell::GetInstance()
121 ->display_manager() 122 ->display_manager()
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 307 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
307 OnDisplayConfigurationChanging()); 308 OnDisplayConfigurationChanging());
308 } 309 }
309 310
310 void WmShellAura::OnDisplayConfigurationChanged() { 311 void WmShellAura::OnDisplayConfigurationChanged() {
311 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 312 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
312 OnDisplayConfigurationChanged()); 313 OnDisplayConfigurationChanged());
313 } 314 }
314 315
315 } // namespace ash 316 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/display/display_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698