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

Unified 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: Cleanup IWYU. 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 side-by-side diff with in-line comments
Download patch
Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 3c82294a8dcb130b7b1e386127de38a892f61662..b1d4951d9491a676db1901977876b4a8c89688ec 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -11,6 +11,7 @@
#include "ash/common/wm_activation_observer.h"
#include "ash/common/wm_display_observer.h"
#include "ash/common/wm_shell_common.h"
+#include "ash/display/display_manager.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
@@ -79,6 +80,9 @@ WmWindow* WmShellAura::GetRootWindowForNewWindows() {
return WmWindowAura::Get(Shell::GetTargetRootWindow());
}
+const DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const {
+ return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id);
+}
bool WmShellAura::IsForceMaximizeOnFirstRun() {
return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();

Powered by Google App Engine
This is Rietveld 408576698