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

Unified Diff: athena/wm/split_view_controller.cc

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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/split_view_controller.h ('k') | athena/wm/split_view_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/split_view_controller.cc
diff --git a/athena/wm/split_view_controller.cc b/athena/wm/split_view_controller.cc
index 40749c76eb2737105cfb7380a9f26b11a59a7d85..77e412c5b078adaffe937a6730cdb7f4295fa098 100644
--- a/athena/wm/split_view_controller.cc
+++ b/athena/wm/split_view_controller.cc
@@ -46,7 +46,7 @@ class StaticViewTargeterDelegate : public views::ViewTargeterDelegate {
private:
// views::ViewTargeterDelegate:
virtual views::View* TargetForRect(views::View* root,
- const gfx::Rect& rect) OVERRIDE {
+ const gfx::Rect& rect) override {
return target_;
}
@@ -78,7 +78,7 @@ class PriorityWindowTargeter : public aura::WindowTargeter,
// aura::WindowTargeter:
virtual ui::EventTarget* FindTargetForLocatedEvent(
ui::EventTarget* root,
- ui::LocatedEvent* event) OVERRIDE {
+ ui::LocatedEvent* event) override {
if (!window_ || (event->type() != ui::ET_TOUCH_PRESSED))
return WindowTargeter::FindTargetForLocatedEvent(root, event);
CHECK_EQ(window_, priority_view_->GetWidget()->GetNativeWindow());
@@ -113,7 +113,7 @@ class PriorityWindowTargeter : public aura::WindowTargeter,
}
// aura::WindowObserver:
- virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
+ virtual void OnWindowDestroying(aura::Window* window) override {
DCHECK_EQ(window, window_);
window_->RemoveObserver(this);
window_ = NULL;
« no previous file with comments | « athena/wm/split_view_controller.h ('k') | athena/wm/split_view_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698