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

Unified Diff: ash/common/wm_shell.h

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
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 78ee00d2744ef22abecc1d6e38367f00db1de364..18753e581fffd0598892ffb754bd2b22e3aa4b4a 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -24,6 +24,7 @@ class PointerWatcher;
namespace ash {
class AccessibilityDelegate;
+class DisplayInfo;
class FocusCycler;
class MruWindowTracker;
class SessionStateDelegate;
@@ -77,6 +78,10 @@ class ASH_EXPORT WmShell {
// appropriate container in the returned window.
virtual WmWindow* GetRootWindowForNewWindows() = 0;
+ // Retuns the display info associated with |display_id|.
+ // TODO(msw): Remove this when DisplayManager has been moved. crbug.com/622480
+ virtual const DisplayInfo& GetDisplayInfo(int64_t display_id) const = 0;
+
// Returns true if the first window shown on first run should be
// unconditionally maximized, overriding the heuristic that normally chooses
// the window size.
@@ -105,8 +110,7 @@ class ASH_EXPORT WmShell {
// Returns true if |window| can be shown for the current user. This is
// intended to check if the current user matches the user associated with
// |window|.
- // TODO(jamescook): Remove this when ShellDelegate is accessible via this
- // interface.
+ // TODO(jamescook): Remove this when ShellDelegate has been moved.
virtual bool CanShowWindowForUser(WmWindow* window) = 0;
// See aura::client::CursorClient for details on these.

Powered by Google App Engine
This is Rietveld 408576698