| Index: mojo/services/window_manager/window_manager_app.cc
|
| diff --git a/mojo/services/window_manager/window_manager_app.cc b/mojo/services/window_manager/window_manager_app.cc
|
| index a22acba0b1c8880beefbf6fb2e2178088cf8f17f..7609119a981238012b988102928579a12db28f36 100644
|
| --- a/mojo/services/window_manager/window_manager_app.cc
|
| +++ b/mojo/services/window_manager/window_manager_app.cc
|
| @@ -37,28 +37,28 @@ class DummyDelegate : public aura::WindowDelegate {
|
|
|
| private:
|
| // WindowDelegate overrides:
|
| - virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); }
|
| - virtual gfx::Size GetMaximumSize() const OVERRIDE { return gfx::Size(); }
|
| + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); }
|
| + virtual gfx::Size GetMaximumSize() const override { return gfx::Size(); }
|
| virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) OVERRIDE {}
|
| - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
|
| + const gfx::Rect& new_bounds) override {}
|
| + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override {
|
| return gfx::kNullCursor;
|
| }
|
| - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
|
| + virtual int GetNonClientComponent(const gfx::Point& point) const override {
|
| return HTCAPTION;
|
| }
|
| virtual bool ShouldDescendIntoChildForEventHandling(
|
| aura::Window* child,
|
| - const gfx::Point& location) OVERRIDE { return true; }
|
| - virtual bool CanFocus() OVERRIDE { return true; }
|
| - virtual void OnCaptureLost() OVERRIDE {}
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {}
|
| - 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 {}
|
| + const gfx::Point& location) override { return true; }
|
| + virtual bool CanFocus() override { return true; }
|
| + virtual void OnCaptureLost() override {}
|
| + virtual void OnPaint(gfx::Canvas* canvas) override {}
|
| + 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 {}
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DummyDelegate);
|
| };
|
|
|