Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: athena/wm/window_overview_mode.cc

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/wm/window_manager_unittest.cc ('k') | chromeos/accelerometer/accelerometer_reader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_overview_mode.cc
diff --git a/athena/wm/window_overview_mode.cc b/athena/wm/window_overview_mode.cc
index bfe9d661ffb41e03bb18d49ccf17d41a96f6b57a..29c8d7d3d6527c13bfa645f898fc77585c825001 100644
--- a/athena/wm/window_overview_mode.cc
+++ b/athena/wm/window_overview_mode.cc
@@ -261,18 +261,17 @@ void AnimateWindowTo(aura::Window* animate_window,
class StaticWindowTargeter : public aura::WindowTargeter {
public:
explicit StaticWindowTargeter(aura::Window* target) : target_(target) {}
- virtual ~StaticWindowTargeter() {}
+ ~StaticWindowTargeter() override {}
private:
// aura::WindowTargeter:
- virtual ui::EventTarget* FindTargetForEvent(ui::EventTarget* root,
- ui::Event* event) override {
+ ui::EventTarget* FindTargetForEvent(ui::EventTarget* root,
+ ui::Event* event) override {
return target_;
}
- virtual ui::EventTarget* FindTargetForLocatedEvent(
- ui::EventTarget* root,
- ui::LocatedEvent* event) override {
+ ui::EventTarget* FindTargetForLocatedEvent(ui::EventTarget* root,
+ ui::LocatedEvent* event) override {
return target_;
}
@@ -309,7 +308,7 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
window_list_provider_->AddObserver(this);
}
- virtual ~WindowOverviewModeImpl() {
+ ~WindowOverviewModeImpl() override {
window_list_provider_->RemoveObserver(this);
container_->set_target_handler(container_->delegate());
RemoveAnimationObserver();
@@ -696,7 +695,7 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
}
// ui::EventHandler:
- virtual void OnMouseEvent(ui::MouseEvent* mouse) override {
+ void OnMouseEvent(ui::MouseEvent* mouse) override {
if (mouse->type() == ui::ET_MOUSE_PRESSED) {
aura::Window* select = SelectWindowAt(mouse);
if (select) {
@@ -708,12 +707,12 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
}
}
- virtual void OnScrollEvent(ui::ScrollEvent* scroll) override {
+ void OnScrollEvent(ui::ScrollEvent* scroll) override {
if (scroll->type() == ui::ET_SCROLL)
DoScroll(scroll->y_offset());
}
- virtual void OnGestureEvent(ui::GestureEvent* gesture) override {
+ void OnGestureEvent(ui::GestureEvent* gesture) override {
if (gesture->type() == ui::ET_GESTURE_TAP) {
aura::Window* select = SelectWindowAt(gesture);
if (select) {
@@ -775,7 +774,7 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
}
// ui::CompositorAnimationObserver:
- virtual void OnAnimationStep(base::TimeTicks timestamp) override {
+ void OnAnimationStep(base::TimeTicks timestamp) override {
CHECK(fling_);
gfx::Vector2dF delta;
bool fling_active = fling_->ComputeScrollDeltaAtTime(timestamp, &delta);
@@ -790,15 +789,14 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
}
// WindowListProviderObserver:
- virtual void OnWindowStackingChanged() override {
+ void OnWindowStackingChanged() override {
// Recompute the states of all windows. There isn't enough information at
// this point to do anything more clever.
ComputeTerminalStatesForAllWindows();
SetInitialWindowStates();
}
- virtual void OnWindowRemoved(aura::Window* removed_window,
- int index) override {
+ void OnWindowRemoved(aura::Window* removed_window, int index) override {
const aura::Window::Windows& windows =
window_list_provider_->GetWindowList();
if (windows.empty())
« no previous file with comments | « athena/wm/window_manager_unittest.cc ('k') | chromeos/accelerometer/accelerometer_reader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698