| Index: components/exo/wm_helper_mus.h
|
| diff --git a/components/exo/wm_helper_mus.h b/components/exo/wm_helper_mus.h
|
| index b2dcd2ec5baeb9c236347ee44406cc72d021b723..2266397a7db2440595748a7843cd457bee9e7b80 100644
|
| --- a/components/exo/wm_helper_mus.h
|
| +++ b/components/exo/wm_helper_mus.h
|
| @@ -31,7 +31,7 @@ class WMHelperMus : public WMHelper,
|
| // Overridden from WMHelper:
|
| const display::ManagedDisplayInfo GetDisplayInfo(
|
| int64_t display_id) const override;
|
| - aura::Window* GetContainer(int container_id) override;
|
| + aura::Window* GetContainer(int64_t display_id, int container_id) override;
|
| aura::Window* GetActiveWindow() const override;
|
| aura::Window* GetFocusedWindow() const override;
|
| ui::CursorSetType GetCursorSet() const override;
|
| @@ -43,6 +43,7 @@ class WMHelperMus : public WMHelper,
|
| bool IsMaximizeModeWindowManagerEnabled() const override;
|
| bool IsSpokenFeedbackEnabled() const override;
|
| void PlayEarcon(int sound_key) const override;
|
| + void SetCursor(gfx::NativeCursor cursor) override;
|
|
|
| // Overridden from aura::EnvObserver:
|
| void OnWindowInitialized(aura::Window* window) override;
|
|
|