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

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: 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 7543d6c0016b8311f1101ed93789c3a7a2644cd3..57f7471341a3c97b1cdd248e1782b8b06af6e51b 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -12,6 +12,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();
« 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