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

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

Issue 2215223004: mash: Migrate ShelfLayoutManager ScreenUtil usage to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore screen bounds conversion for app list. 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
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/wm/wm_screen_util.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/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 } 89 }
90 90
91 const DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const { 91 const DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const {
92 return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id); 92 return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id);
93 } 93 }
94 94
95 bool WmShellAura::IsActiveDisplayId(int64_t display_id) const { 95 bool WmShellAura::IsActiveDisplayId(int64_t display_id) const {
96 return Shell::GetInstance()->display_manager()->IsActiveDisplayId(display_id); 96 return Shell::GetInstance()->display_manager()->IsActiveDisplayId(display_id);
97 } 97 }
98 98
99 display::Display WmShellAura::GetFirstDisplay() const {
100 return Shell::GetInstance()
101 ->display_manager()
102 ->software_mirroring_display_list()[0];
103 }
104
105 bool WmShellAura::IsInUnifiedMode() const {
106 return Shell::GetInstance()->display_manager()->IsInUnifiedMode();
107 }
108
99 bool WmShellAura::IsForceMaximizeOnFirstRun() { 109 bool WmShellAura::IsForceMaximizeOnFirstRun() {
100 return delegate()->IsForceMaximizeOnFirstRun(); 110 return delegate()->IsForceMaximizeOnFirstRun();
101 } 111 }
102 112
103 bool WmShellAura::IsPinned() { 113 bool WmShellAura::IsPinned() {
104 return Shell::GetInstance()->screen_pinning_controller()->IsPinned(); 114 return Shell::GetInstance()->screen_pinning_controller()->IsPinned();
105 } 115 }
106 116
107 void WmShellAura::SetPinnedWindow(WmWindow* window) { 117 void WmShellAura::SetPinnedWindow(WmWindow* window) {
108 return Shell::GetInstance()->screen_pinning_controller()->SetPinnedWindow( 118 return Shell::GetInstance()->screen_pinning_controller()->SetPinnedWindow(
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 261 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
252 OnDisplayConfigurationChanging()); 262 OnDisplayConfigurationChanging());
253 } 263 }
254 264
255 void WmShellAura::OnDisplayConfigurationChanged() { 265 void WmShellAura::OnDisplayConfigurationChanged() {
256 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 266 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
257 OnDisplayConfigurationChanged()); 267 OnDisplayConfigurationChanged());
258 } 268 }
259 269
260 } // namespace ash 270 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/wm/wm_screen_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698