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

Unified Diff: ash/wm/partial_screenshot_view.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/wm/partial_screenshot_view.h ('k') | ash/wm/partial_screenshot_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/partial_screenshot_view.cc
diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc
index b18c9fb530f0cd5076ef1440297c9b3e10333d6a..789ea1e90e58d6f1c3990e8a44ccc0f3761397bd 100644
--- a/ash/wm/partial_screenshot_view.cc
+++ b/ash/wm/partial_screenshot_view.cc
@@ -39,7 +39,7 @@ class PartialScreenshotView::OverlayDelegate
}
// Overridden from OverlayEventFilter::Delegate:
- virtual void Cancel() OVERRIDE {
+ virtual void Cancel() override {
// Make sure the mouse_warp_mode allows warping. It can be stopped by a
// partial screenshot view.
MouseCursorEventFilter* mouse_cursor_filter =
@@ -50,18 +50,18 @@ class PartialScreenshotView::OverlayDelegate
widgets_[i]->Close();
}
- virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) OVERRIDE {
+ virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) override {
return event->key_code() == ui::VKEY_ESCAPE;
}
- virtual aura::Window* GetWindow() OVERRIDE {
+ virtual aura::Window* GetWindow() override {
// Just returns NULL because this class does not handle key events in
// OverlayEventFilter, except for cancel keys.
return NULL;
}
// Overridden from views::WidgetObserver:
- virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE {
+ virtual void OnWidgetDestroying(views::Widget* widget) override {
widget->RemoveObserver(this);
widgets_.erase(std::remove(widgets_.begin(), widgets_.end(), widget));
if (widgets_.empty())
« no previous file with comments | « ash/wm/partial_screenshot_view.h ('k') | ash/wm/partial_screenshot_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698