| Index: ui/display/win/screen_win.h
|
| diff --git a/ui/display/win/screen_win.h b/ui/display/win/screen_win.h
|
| index 422077d521282c11243eb15cb2a9a58e45f6f2fa..2a7cdb10de6ca5eead27df233c870382593166b0 100644
|
| --- a/ui/display/win/screen_win.h
|
| +++ b/ui/display/win/screen_win.h
|
| @@ -114,7 +114,7 @@ class DISPLAY_EXPORT ScreenWin : public display::Screen {
|
| bool IsWindowUnderCursor(gfx::NativeWindow window) override;
|
| gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
|
| int GetNumDisplays() const override;
|
| - std::vector<display::Display> GetAllDisplays() const override;
|
| + const std::vector<display::Display>& GetAllDisplays() const override;
|
| display::Display GetDisplayNearestWindow(
|
| gfx::NativeView window) const override;
|
| display::Display GetDisplayNearestPoint(
|
| @@ -185,6 +185,11 @@ class DISPLAY_EXPORT ScreenWin : public display::Screen {
|
| // Current list of ScreenWinDisplays.
|
| std::vector<ScreenWinDisplay> screen_win_displays_;
|
|
|
| + // The display::Displays corresponding to |screen_win_displays_| for
|
| + // GetAllDisplays(). This must be updated anytime |screen_win_displays_| is
|
| + // updated.
|
| + std::vector<display::Display> displays_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ScreenWin);
|
| };
|
|
|
|
|