mash: Migrate tray audio and deps to common.

ash/common/wm_shell.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/metrics/user_metrics_action.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class PointerWatcher;
 }
 
 namespace ash {
 
 class AccessibilityDelegate;
+class DisplayInfo;
 class FocusCycler;
 class MruWindowTracker;
 class SessionStateDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class WindowResizer;
 class WmActivationObserver;
 class WmDisplayObserver;
 class WmSystemTrayNotifier;
 class WmWindow;
@@ skipping 33 matching lines @@
   virtual WmWindow* GetPrimaryRootWindow() = 0;
 
   // Returns the root window for the specified display.
   virtual WmWindow* GetRootWindowForDisplayId(int64_t display_id) = 0;
 
   // Returns the root window that newly created windows should be added to.
   // NOTE: this returns the root, newly created window should be added to the
   // 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.

[James Cook, 2016/06/22 21:27:24]

maybe cite the bug here?

[msw, 2016/06/22 22:16:11]

Done.

+  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.
   virtual bool IsForceMaximizeOnFirstRun() = 0;
 
   // Returns true if a system-modal dialog window is currently open.
   bool IsSystemModalWindowOpen();
 
   // For testing only: set simulation that a modal window is open
   void SimulateModalWindowOpenForTesting(bool modal_window_open) {
     simulate_modal_window_open_for_testing_ = modal_window_open;
   }
 
   // Returns true if a window is currently pinned.
   virtual bool IsPinned() = 0;
 
   // Sets/Unsets the |window| to as a pinned window. If this is called with a
   // window with WINDOW_STATE_TYPE_PINNED state, then this sets the |window|
   // as a pinned window. Otherwise, this unsets it.
   // For setting, a caller needs to guarantee that no windows are set
   // as pinned window. For unsetting, a caller needs to guarantee that the
   // |window| is the one which is currently set as a pinned window via previous
   // this function invocation.
   virtual void SetPinnedWindow(WmWindow* window) = 0;
 
   // 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.
   virtual void LockCursor() = 0;
   virtual void UnlockCursor() = 0;
 
   virtual std::vector<WmWindow*> GetAllRootWindows() = 0;
 
   virtual void RecordUserMetricsAction(UserMetricsAction action) = 0;
 
@@ skipping 53 matching lines @@
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<WmSystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_