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

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 678973004: Standardize usage of virtual/override/final specifiers. (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
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 3a9e7abef6deb7fcc81da206248f59d612280071..210fb5b3d70380f20addf88eb8fdaa648b7791c0 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -144,19 +144,19 @@ class OverscrollWindowDelegate : public ImageWindowDelegate {
void stop_forwarding_events() { forward_events_ = false; }
private:
- virtual ~OverscrollWindowDelegate() {}
+ ~OverscrollWindowDelegate() override {}
aura::Window* web_contents_window() {
return web_contents_->GetView()->GetContentNativeView();
}
// Overridden from ui::EventHandler.
- virtual void OnScrollEvent(ui::ScrollEvent* event) override {
+ void OnScrollEvent(ui::ScrollEvent* event) override {
if (forward_events_ && web_contents_window())
web_contents_window()->delegate()->OnScrollEvent(event);
}
- virtual void OnGestureEvent(ui::GestureEvent* event) override {
+ void OnGestureEvent(ui::GestureEvent* event) override {
if (forward_events_ && web_contents_window())
web_contents_window()->delegate()->OnGestureEvent(event);
}
@@ -186,13 +186,12 @@ class WebDragSourceAura : public NotificationObserver {
Source<WebContents>(contents));
}
- virtual ~WebDragSourceAura() {
- }
+ ~WebDragSourceAura() override {}
// NotificationObserver:
- virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) override {
+ void Observe(int type,
+ const NotificationSource& source,
+ const NotificationDetails& details) override {
if (type != NOTIFICATION_WEB_CONTENTS_DISCONNECTED)
return;
@@ -479,7 +478,7 @@ class WebContentsViewAura::WindowObserver
#endif
}
- virtual ~WindowObserver() {
+ ~WindowObserver() override {
view_->window_->RemoveObserver(this);
if (view_->window_->GetHost())
view_->window_->GetHost()->RemoveObserver(this);
@@ -503,7 +502,7 @@ class WebContentsViewAura::WindowObserver
}
// Overridden from aura::WindowObserver:
- virtual void OnWindowHierarchyChanged(
+ void OnWindowHierarchyChanged(
const aura::WindowObserver::HierarchyChangeParams& params) override {
if (params.receiver != view_->window_.get() ||
!params.target->Contains(view_->window_.get())) {
@@ -560,8 +559,8 @@ class WebContentsViewAura::WindowObserver
}
#endif
- virtual void OnWindowParentChanged(aura::Window* window,
- aura::Window* parent) override {
+ void OnWindowParentChanged(aura::Window* window,
+ aura::Window* parent) override {
if (window != view_->window_)
return;
@@ -615,9 +614,9 @@ class WebContentsViewAura::WindowObserver
}
}
- virtual void OnWindowBoundsChanged(aura::Window* window,
- const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override {
+ void OnWindowBoundsChanged(aura::Window* window,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override {
if (window == host_window_ || window == view_->window_) {
SendScreenRects();
if (view_->touch_editable_)
@@ -629,14 +628,14 @@ class WebContentsViewAura::WindowObserver
}
}
- virtual void OnWindowDestroying(aura::Window* window) override {
+ void OnWindowDestroying(aura::Window* window) override {
if (window == host_window_) {
host_window_->RemoveObserver(this);
host_window_ = NULL;
}
}
- virtual void OnWindowAddedToRootWindow(aura::Window* window) override {
+ void OnWindowAddedToRootWindow(aura::Window* window) override {
if (window == view_->window_) {
window->GetHost()->AddObserver(this);
#if defined(OS_WIN)
@@ -646,8 +645,8 @@ class WebContentsViewAura::WindowObserver
}
}
- virtual void OnWindowRemovingFromRootWindow(aura::Window* window,
- aura::Window* new_root) override {
+ void OnWindowRemovingFromRootWindow(aura::Window* window,
+ aura::Window* new_root) override {
if (window == view_->window_) {
window->GetHost()->RemoveObserver(this);
#if defined(OS_WIN)
@@ -666,8 +665,8 @@ class WebContentsViewAura::WindowObserver
}
// Overridden WindowTreeHostObserver:
- virtual void OnHostMoved(const aura::WindowTreeHost* host,
- const gfx::Point& new_origin) override {
+ void OnHostMoved(const aura::WindowTreeHost* host,
+ const gfx::Point& new_origin) override {
TRACE_EVENT1("ui",
"WebContentsViewAura::WindowObserver::OnHostMoved",
"new_origin", new_origin.ToString());

Powered by Google App Engine
This is Rietveld 408576698