| Index: ash/mus/bridge/wm_shell_mus.h
|
| diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
|
| index 9bae6bc7b324063307e88d021a995b82b4afa174..0f895ae6ae1a1b053f0b963f3018000e607fa24c 100644
|
| --- a/ash/mus/bridge/wm_shell_mus.h
|
| +++ b/ash/mus/bridge/wm_shell_mus.h
|
| @@ -49,6 +49,7 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
|
| WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
|
| WmWindow* GetRootWindowForNewWindows() override;
|
| const DisplayInfo& GetDisplayInfo(int64_t display_id) const override;
|
| + bool IsActiveDisplayId(int64_t display_id) const override;
|
| bool IsForceMaximizeOnFirstRun() override;
|
| bool IsPinned() override;
|
| void SetPinnedWindow(WmWindow* window) override;
|
| @@ -62,6 +63,8 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
|
| wm::WindowState* window_state) override;
|
| std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler()
|
| override;
|
| + std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
|
| + CreateScopedDisableInternalMouseAndKeyboard() override;
|
| void OnOverviewModeStarting() override;
|
| void OnOverviewModeEnded() override;
|
| AccessibilityDelegate* GetAccessibilityDelegate() override;
|
|
|