| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index a8ba722a6b9b0c7248ecd7448867badc4367f01f..68e15ab5882e0ad66c22bd1b885c83dda13f4abd 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -213,50 +213,33 @@ void SetUsesEasyResizeTargeter(aura::Window* container) {
|
| class EmptyWindowDelegate : public aura::WindowDelegate {
|
| public:
|
| EmptyWindowDelegate() {}
|
| - virtual ~EmptyWindowDelegate() {}
|
| + ~EmptyWindowDelegate() override {}
|
|
|
| // aura::WindowDelegate overrides:
|
| - 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 {
|
| + gfx::Size GetMinimumSize() const override { return gfx::Size(); }
|
| + gfx::Size GetMaximumSize() const override { return gfx::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 {
|
| - }
|
| - virtual void OnDeviceScaleFactorChanged(
|
| - float device_scale_factor) override {
|
| - }
|
| - virtual void OnWindowDestroying(aura::Window* window) override {}
|
| - virtual void OnWindowDestroyed(aura::Window* window) override {
|
| - delete this;
|
| - }
|
| - virtual void OnWindowTargetVisibilityChanged(bool visible) override {
|
| - }
|
| - virtual bool HasHitTestMask() const override {
|
| - return false;
|
| - }
|
| - virtual void GetHitTestMask(gfx::Path* mask) const override {}
|
| + bool CanFocus() override { return false; }
|
| + void OnCaptureLost() override {}
|
| + void OnPaint(gfx::Canvas* canvas) override {}
|
| + void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
|
| + void OnWindowDestroying(aura::Window* window) override {}
|
| + void OnWindowDestroyed(aura::Window* window) override { delete this; }
|
| + void OnWindowTargetVisibilityChanged(bool visible) override {}
|
| + bool HasHitTestMask() const override { return false; }
|
| + void GetHitTestMask(gfx::Path* mask) const override {}
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(EmptyWindowDelegate);
|
|
|