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

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

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and 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 | « 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 "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"
11 #include "ash/common/wm/overview/window_selector_controller.h" 11 #include "ash/common/wm/overview/window_selector_controller.h"
12 #include "ash/common/wm_activation_observer.h" 12 #include "ash/common/wm_activation_observer.h"
13 #include "ash/common/wm_display_observer.h" 13 #include "ash/common/wm_display_observer.h"
14 #include "ash/common/wm_shell_common.h" 14 #include "ash/common/wm_shell_common.h"
15 #include "ash/display/display_manager.h"
15 #include "ash/display/window_tree_host_manager.h" 16 #include "ash/display/window_tree_host_manager.h"
16 #include "ash/shell.h" 17 #include "ash/shell.h"
17 #include "ash/shell_delegate.h" 18 #include "ash/shell_delegate.h"
18 #include "ash/wm/drag_window_resizer.h" 19 #include "ash/wm/drag_window_resizer.h"
19 #include "ash/wm/screen_pinning_controller.h" 20 #include "ash/wm/screen_pinning_controller.h"
20 #include "ash/wm/window_util.h" 21 #include "ash/wm/window_util.h"
21 #include "base/memory/ptr_util.h" 22 #include "base/memory/ptr_util.h"
22 #include "ui/aura/client/focus_client.h" 23 #include "ui/aura/client/focus_client.h"
23 #include "ui/wm/public/activation_client.h" 24 #include "ui/wm/public/activation_client.h"
24 25
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 WmWindow* WmShellAura::GetRootWindowForDisplayId(int64_t display_id) { 73 WmWindow* WmShellAura::GetRootWindowForDisplayId(int64_t display_id) {
73 return WmWindowAura::Get(Shell::GetInstance() 74 return WmWindowAura::Get(Shell::GetInstance()
74 ->window_tree_host_manager() 75 ->window_tree_host_manager()
75 ->GetRootWindowForDisplayId(display_id)); 76 ->GetRootWindowForDisplayId(display_id));
76 } 77 }
77 78
78 WmWindow* WmShellAura::GetRootWindowForNewWindows() { 79 WmWindow* WmShellAura::GetRootWindowForNewWindows() {
79 return WmWindowAura::Get(Shell::GetTargetRootWindow()); 80 return WmWindowAura::Get(Shell::GetTargetRootWindow());
80 } 81 }
81 82
83 const DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const {
84 return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id);
85 }
82 86
83 bool WmShellAura::IsForceMaximizeOnFirstRun() { 87 bool WmShellAura::IsForceMaximizeOnFirstRun() {
84 return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun(); 88 return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();
85 } 89 }
86 90
87 bool WmShellAura::IsPinned() { 91 bool WmShellAura::IsPinned() {
88 return Shell::GetInstance()->screen_pinning_controller()->IsPinned(); 92 return Shell::GetInstance()->screen_pinning_controller()->IsPinned();
89 } 93 }
90 94
91 void WmShellAura::SetPinnedWindow(WmWindow* window) { 95 void WmShellAura::SetPinnedWindow(WmWindow* window) {
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 229 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
226 OnDisplayConfigurationChanging()); 230 OnDisplayConfigurationChanging());
227 } 231 }
228 232
229 void WmShellAura::OnDisplayConfigurationChanged() { 233 void WmShellAura::OnDisplayConfigurationChanged() {
230 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 234 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
231 OnDisplayConfigurationChanged()); 235 OnDisplayConfigurationChanged());
232 } 236 }
233 237
234 } // namespace ash 238 } // 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