| Index: ash/display/cursor_window_controller.cc
|
| diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc
|
| index 14a905c96f548ea2ac5f6685db86ad57d7362fea..53197d8dcc14fc69f3d7af62eec2b34e9cb68e5c 100644
|
| --- a/ash/display/cursor_window_controller.cc
|
| +++ b/ash/display/cursor_window_controller.cc
|
| @@ -26,37 +26,35 @@ namespace ash {
|
| class CursorWindowDelegate : public aura::WindowDelegate {
|
| public:
|
| CursorWindowDelegate() : is_cursor_compositing_enabled_(false) {}
|
| - virtual ~CursorWindowDelegate() {}
|
| + ~CursorWindowDelegate() override {}
|
|
|
| // aura::WindowDelegate overrides:
|
| - virtual gfx::Size GetMinimumSize() const override { return size_; }
|
| - virtual gfx::Size GetMaximumSize() const override { return size_; }
|
| - virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) override {}
|
| - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override {
|
| + gfx::Size GetMinimumSize() const override { return size_; }
|
| + gfx::Size GetMaximumSize() const override { return size_; }
|
| + void OnBoundsChanged(const gfx::Rect& old_bounds,
|
| + const gfx::Rect& new_bounds) override {}
|
| + gfx::NativeCursor GetCursor(const gfx::Point& point) override {
|
| return gfx::kNullCursor;
|
| }
|
| - virtual int GetNonClientComponent(
|
| - const gfx::Point& point) const override {
|
| + int GetNonClientComponent(const gfx::Point& point) const override {
|
| return HTNOWHERE;
|
| }
|
| - virtual bool ShouldDescendIntoChildForEventHandling(
|
| + bool ShouldDescendIntoChildForEventHandling(
|
| aura::Window* child,
|
| const gfx::Point& location) override {
|
| return false;
|
| }
|
| - virtual bool CanFocus() override { return false; }
|
| - virtual void OnCaptureLost() override {}
|
| - virtual void OnPaint(gfx::Canvas* canvas) override {
|
| + bool CanFocus() override { return false; }
|
| + void OnCaptureLost() override {}
|
| + void OnPaint(gfx::Canvas* canvas) override {
|
| canvas->DrawImageInt(cursor_image_, 0, 0);
|
| }
|
| - virtual void OnDeviceScaleFactorChanged(
|
| - float device_scale_factor) override {}
|
| - virtual void OnWindowDestroying(aura::Window* window) override {}
|
| - virtual void OnWindowDestroyed(aura::Window* window) override {}
|
| - virtual void OnWindowTargetVisibilityChanged(bool visible) override {}
|
| - virtual bool HasHitTestMask() const override { return false; }
|
| - virtual void GetHitTestMask(gfx::Path* mask) const override {}
|
| + void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
|
| + void OnWindowDestroying(aura::Window* window) override {}
|
| + void OnWindowDestroyed(aura::Window* window) override {}
|
| + void OnWindowTargetVisibilityChanged(bool visible) override {}
|
| + bool HasHitTestMask() const override { return false; }
|
| + void GetHitTestMask(gfx::Path* mask) const override {}
|
|
|
| // Sets cursor compositing mode on/off.
|
| void SetCursorCompositingEnabled(bool enabled) {
|
|
|