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

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

Issue 2055053002: mash: Convert ash::ShellDelegate from aura::Window to WmWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movetrayupdate
Patch Set: rebase Created 4 years, 6 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 | « no previous file | ash/common/wm_shell.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 "ash/aura/wm_window_aura.h" 7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shell_observer.h" 9 #include "ash/common/shell_observer.h"
10 #include "ash/common/wm/mru_window_tracker.h" 10 #include "ash/common/wm/mru_window_tracker.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 WmWindow* WmShellAura::GetRootWindowForNewWindows() { 73 WmWindow* WmShellAura::GetRootWindowForNewWindows() {
74 return WmWindowAura::Get(Shell::GetTargetRootWindow()); 74 return WmWindowAura::Get(Shell::GetTargetRootWindow());
75 } 75 }
76 76
77 77
78 bool WmShellAura::IsForceMaximizeOnFirstRun() { 78 bool WmShellAura::IsForceMaximizeOnFirstRun() {
79 return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun(); 79 return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();
80 } 80 }
81 81
82 bool WmShellAura::CanShowWindowForUser(WmWindow* window) { 82 bool WmShellAura::CanShowWindowForUser(WmWindow* window) {
83 return Shell::GetInstance()->delegate()->CanShowWindowForUser( 83 return Shell::GetInstance()->delegate()->CanShowWindowForUser(window);
84 WmWindowAura::GetAuraWindow(window));
85 } 84 }
86 85
87 void WmShellAura::LockCursor() { 86 void WmShellAura::LockCursor() {
88 Shell::GetInstance()->cursor_manager()->LockCursor(); 87 Shell::GetInstance()->cursor_manager()->LockCursor();
89 } 88 }
90 89
91 void WmShellAura::UnlockCursor() { 90 void WmShellAura::UnlockCursor() {
92 Shell::GetInstance()->cursor_manager()->UnlockCursor(); 91 Shell::GetInstance()->cursor_manager()->UnlockCursor();
93 } 92 }
94 93
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 195 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
197 OnDisplayConfigurationChanging()); 196 OnDisplayConfigurationChanging());
198 } 197 }
199 198
200 void WmShellAura::OnDisplayConfigurationChanged() { 199 void WmShellAura::OnDisplayConfigurationChanged() {
201 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 200 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
202 OnDisplayConfigurationChanged()); 201 OnDisplayConfigurationChanged());
203 } 202 }
204 203
205 } // namespace ash 204 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698