| Index: ui/views/widget/desktop_aura/desktop_screen_x11.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.h b/ui/views/widget/desktop_aura/desktop_screen_x11.h
|
| index ff47806eb6799e18740742b5f591e9a56d49deb6..1fc32d101d1482236284c6fd7b09d958d7d03ebb 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_screen_x11.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_screen_x11.h
|
| @@ -31,26 +31,26 @@ class VIEWS_EXPORT DesktopScreenX11 : public gfx::Screen,
|
| virtual ~DesktopScreenX11();
|
|
|
| // Overridden from gfx::Screen:
|
| - virtual bool IsDIPEnabled() OVERRIDE;
|
| - virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
|
| - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE;
|
| + virtual bool IsDIPEnabled() override;
|
| + virtual gfx::Point GetCursorScreenPoint() override;
|
| + virtual gfx::NativeWindow GetWindowUnderCursor() override;
|
| virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)
|
| - OVERRIDE;
|
| - virtual int GetNumDisplays() const OVERRIDE;
|
| - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE;
|
| + override;
|
| + virtual int GetNumDisplays() const override;
|
| + virtual std::vector<gfx::Display> GetAllDisplays() const override;
|
| virtual gfx::Display GetDisplayNearestWindow(
|
| - gfx::NativeView window) const OVERRIDE;
|
| + gfx::NativeView window) const override;
|
| virtual gfx::Display GetDisplayNearestPoint(
|
| - const gfx::Point& point) const OVERRIDE;
|
| + const gfx::Point& point) const override;
|
| virtual gfx::Display GetDisplayMatching(
|
| - const gfx::Rect& match_rect) const OVERRIDE;
|
| - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE;
|
| - virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE;
|
| - virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE;
|
| + const gfx::Rect& match_rect) const override;
|
| + virtual gfx::Display GetPrimaryDisplay() const override;
|
| + virtual void AddObserver(gfx::DisplayObserver* observer) override;
|
| + virtual void RemoveObserver(gfx::DisplayObserver* observer) override;
|
|
|
| // ui::PlatformEventDispatcher:
|
| - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
|
| - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
|
| + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
|
| + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
|
|
|
| private:
|
| friend class DesktopScreenX11Test;
|
|
|