| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index a735aff095f707f38d36f69c7fe8b78be89dc7c5..93973edc9cfcb271de1936a3c5b2154fc238a689 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -352,16 +352,16 @@ class RenderWidgetHostViewAura::EventFilterForPopupExit
|
| aura::Env::GetInstance()->AddPreTargetHandler(this);
|
| }
|
|
|
| - virtual ~EventFilterForPopupExit() {
|
| + ~EventFilterForPopupExit() override {
|
| aura::Env::GetInstance()->RemovePreTargetHandler(this);
|
| }
|
|
|
| // Overridden from ui::EventHandler
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) override {
|
| + void OnMouseEvent(ui::MouseEvent* event) override {
|
| rwhva_->ApplyEventFilterForPopupExit(event);
|
| }
|
|
|
| - virtual void OnTouchEvent(ui::TouchEvent* event) override {
|
| + void OnTouchEvent(ui::TouchEvent* event) override {
|
| rwhva_->ApplyEventFilterForPopupExit(event);
|
| }
|
|
|
| @@ -403,18 +403,16 @@ class RenderWidgetHostViewAura::WindowObserver : public aura::WindowObserver {
|
| view_->window_->AddObserver(this);
|
| }
|
|
|
| - virtual ~WindowObserver() {
|
| - view_->window_->RemoveObserver(this);
|
| - }
|
| + ~WindowObserver() override { view_->window_->RemoveObserver(this); }
|
|
|
| // Overridden from aura::WindowObserver:
|
| - virtual void OnWindowAddedToRootWindow(aura::Window* window) override {
|
| + void OnWindowAddedToRootWindow(aura::Window* window) override {
|
| if (window == view_->window_)
|
| view_->AddedToRootWindow();
|
| }
|
|
|
| - 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_)
|
| view_->RemovingFromRootWindow();
|
| }
|
|
|