diff options
Diffstat (limited to 'ash/wm')
-rw-r--r-- | ash/wm/always_on_top_controller_unittest.cc | 4 | ||||
-rw-r--r-- | ash/wm/overview/scoped_transform_overview_window.h | 2 | ||||
-rw-r--r-- | ash/wm/overview/transparent_activate_window_button.cc | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/ash/wm/always_on_top_controller_unittest.cc b/ash/wm/always_on_top_controller_unittest.cc index fe502e3..535ed5f 100644 --- a/ash/wm/always_on_top_controller_unittest.cc +++ b/ash/wm/always_on_top_controller_unittest.cc @@ -38,9 +38,9 @@ class TestLayoutManager : public WorkspaceLayoutManager { explicit TestLayoutManager(aura::Window* window) : WorkspaceLayoutManager(window), keyboard_bounds_changed_(false) {} - ~TestLayoutManager() {} + ~TestLayoutManager() override {} - virtual void OnKeyboardBoundsChanging(const gfx::Rect& bounds) override { + void OnKeyboardBoundsChanging(const gfx::Rect& bounds) override { keyboard_bounds_changed_ = true; WorkspaceLayoutManager::OnKeyboardBoundsChanging(bounds); } diff --git a/ash/wm/overview/scoped_transform_overview_window.h b/ash/wm/overview/scoped_transform_overview_window.h index b38f517..daa25dee 100644 --- a/ash/wm/overview/scoped_transform_overview_window.h +++ b/ash/wm/overview/scoped_transform_overview_window.h @@ -51,7 +51,7 @@ class ScopedTransformOverviewWindow const gfx::Rect& dst_rect); explicit ScopedTransformOverviewWindow(aura::Window* window); - virtual ~ScopedTransformOverviewWindow(); + ~ScopedTransformOverviewWindow() override; gfx::Transform get_overview_transform() const { return overview_transform_; } diff --git a/ash/wm/overview/transparent_activate_window_button.cc b/ash/wm/overview/transparent_activate_window_button.cc index 5c6a404..212b57c 100644 --- a/ash/wm/overview/transparent_activate_window_button.cc +++ b/ash/wm/overview/transparent_activate_window_button.cc @@ -35,11 +35,9 @@ class TransparentButton TransparentActivateWindowButtonDelegate* delegate() { return delegate_; } // views::View: - virtual void OnGestureEvent(ui::GestureEvent* event) override; + void OnGestureEvent(ui::GestureEvent* event) override; - virtual const char* GetClassName() const override { - return kTransparentButtonName; - } + const char* GetClassName() const override { return kTransparentButtonName; } // views::ButtonListener: void ButtonPressed(views::Button* sender, const ui::Event& event) override; |