From 10d6b38a855066b1400d96d0600c6e2aec42cbf1 Mon Sep 17 00:00:00 2001 From: mostynb Date: Fri, 3 Oct 2014 09:23:45 -0700 Subject: replace OVERRIDE and FINAL with override and final in ash/ BUG=417463 Review URL: https://codereview.chromium.org/621133002 Cr-Commit-Position: refs/heads/master@{#298040} --- ash/desktop_background/desktop_background_controller.h | 4 ++-- ash/desktop_background/desktop_background_controller_unittest.cc | 2 +- ash/desktop_background/desktop_background_view.cc | 6 +++--- ash/desktop_background/desktop_background_view.h | 6 +++--- ash/desktop_background/desktop_background_widget_controller.cc | 6 +++--- ash/desktop_background/desktop_background_widget_controller.h | 2 +- ash/desktop_background/wallpaper_resizer_unittest.cc | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'ash/desktop_background') diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h index ec9cd5f..e9bf639 100644 --- a/ash/desktop_background/desktop_background_controller.h +++ b/ash/desktop_background/desktop_background_controller.h @@ -97,10 +97,10 @@ class ASH_EXPORT DesktopBackgroundController bool MoveDesktopToUnlockedContainer(); // DisplayController::Observer: - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplayConfigurationChanged() override; // ShellObserver: - virtual void OnRootWindowAdded(aura::Window* root_window) OVERRIDE; + virtual void OnRootWindowAdded(aura::Window* root_window) override; // Returns the maximum size of all displays combined in native // resolutions. Note that this isn't the bounds of the display who diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc index 01a7159..e504f03 100644 --- a/ash/desktop_background/desktop_background_controller_unittest.cc +++ b/ash/desktop_background/desktop_background_controller_unittest.cc @@ -73,7 +73,7 @@ class DesktopBackgroundControllerTest : public test::AshTestBase { } virtual ~DesktopBackgroundControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); // Ash shell initialization creates wallpaper. Reset it so we can manually // control wallpaper creation and animation in our tests. diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index 1c6f6db..3af8599 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -49,7 +49,7 @@ class LayerControlView : public views::View { } // Overrides views::View. - virtual void Layout() OVERRIDE { + virtual void Layout() override { gfx::Display display = Shell::GetScreen()->GetDisplayNearestWindow( GetWidget()->GetNativeView()); DisplayManager* display_manager = Shell::GetInstance()->display_manager(); @@ -83,7 +83,7 @@ class PreEventDispatchHandler : public ui::EventHandler { private: // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { CHECK_EQ(ui::EP_PRETARGET, event->phase()); WindowSelectorController* controller = Shell::GetInstance()->window_selector_controller(); @@ -93,7 +93,7 @@ class PreEventDispatchHandler : public ui::EventHandler { } } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { CHECK_EQ(ui::EP_PRETARGET, event->phase()); WindowSelectorController* controller = Shell::GetInstance()->window_selector_controller(); diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h index 8a598f3..6a93823 100644 --- a/ash/desktop_background/desktop_background_view.h +++ b/ash/desktop_background/desktop_background_view.h @@ -22,13 +22,13 @@ class DesktopBackgroundView : public views::View, private: // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; // Overridden from views::ContextMenuController: virtual void ShowContextMenuForView(views::View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; scoped_ptr pre_dispatch_handler_; DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView); diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc index 4a19538..cd90318 100644 --- a/ash/desktop_background/desktop_background_widget_controller.cc +++ b/ash/desktop_background/desktop_background_widget_controller.cc @@ -38,20 +38,20 @@ class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver, private: // Overridden from ui::ImplicitAnimationObserver: - virtual void OnImplicitAnimationsScheduled() OVERRIDE { + virtual void OnImplicitAnimationsScheduled() override { if (is_initial_animation_) { root_window_controller_-> HandleInitialDesktopBackgroundAnimationStarted(); } } - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { root_window_controller_->OnWallpaperAnimationFinished(desktop_widget_); delete this; } // Overridden from views::WidgetObserver. - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(views::Widget* widget) override { delete this; } diff --git a/ash/desktop_background/desktop_background_widget_controller.h b/ash/desktop_background/desktop_background_widget_controller.h index 6a40a2d..0aafe2e 100644 --- a/ash/desktop_background/desktop_background_widget_controller.h +++ b/ash/desktop_background/desktop_background_widget_controller.h @@ -28,7 +28,7 @@ class ASH_EXPORT DesktopBackgroundWidgetController virtual ~DesktopBackgroundWidgetController(); // Overridden from views::WidgetObserver. - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; // Set bounds of component that draws background. void SetBounds(gfx::Rect bounds); diff --git a/ash/desktop_background/wallpaper_resizer_unittest.cc b/ash/desktop_background/wallpaper_resizer_unittest.cc index fb951ef..97bd249 100644 --- a/ash/desktop_background/wallpaper_resizer_unittest.cc +++ b/ash/desktop_background/wallpaper_resizer_unittest.cc @@ -79,7 +79,7 @@ class WallpaperResizerTest : public testing::Test, message_loop_.Run(); } - virtual void OnWallpaperResized() OVERRIDE { + virtual void OnWallpaperResized() override { message_loop_.Quit(); } -- cgit v1.1