Make RootView::DispatchGestureEvent() non-virtual

ui/views/widget/root_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/root_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 244 matching lines @@
   //                   that event type has been refactored, and then
   //                   eventually remove this function altogether. See
   //                   crbug.com/348083.
   if (event->IsKeyEvent())
     return EventProcessor::OnEventFromSource(event);
   else if (event->IsScrollEvent())
     return EventProcessor::OnEventFromSource(event);
   else if (event->IsTouchEvent())
     NOTREACHED() << "Touch events should not be sent to RootView.";
   else if (event->IsGestureEvent())
-    DispatchGestureEvent(static_cast<ui::GestureEvent*>(event));
+    DispatchGestureEvent(event->AsGestureEvent());
   else if (event->IsMouseEvent())
     NOTREACHED() << "Should not be called with a MouseEvent.";
   else
     NOTREACHED() << "Invalid event type.";
 
   return DispatchDetails();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootView, View overrides:
@@ skipping 273 matching lines @@
 }
 
 void RootView::UpdateParentLayer() {
   if (layer())
     ReparentLayer(gfx::Vector2d(GetMirroredX(), y()), widget_->GetLayer());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootView, protected:
 
+void RootView::ViewHierarchyChanged(
+    const ViewHierarchyChangedDetails& details) {
+  widget_->ViewHierarchyChanged(details);
+
+  if (!details.is_add) {
+    if (!explicit_mouse_handler_ && mouse_pressed_handler_ == details.child)
+      mouse_pressed_handler_ = NULL;
+    if (mouse_move_handler_ == details.child)
+      mouse_move_handler_ = NULL;
+    if (gesture_handler_ == details.child)
+      gesture_handler_ = NULL;
+    if (scroll_gesture_handler_ == details.child)
+      scroll_gesture_handler_ = NULL;
+    if (event_dispatch_target_ == details.child)
+      event_dispatch_target_ = NULL;
+    if (old_dispatch_target_ == details.child)
+      old_dispatch_target_ = NULL;
+  }
+}
+
+void RootView::VisibilityChanged(View* /*starting_from*/, bool is_visible) {
+  if (!is_visible) {
+    // When the root view is being hidden (e.g. when widget is minimized)
+    // handlers are reset, so that after it is reshown, events are not captured
+    // by old handlers.
+    explicit_mouse_handler_ = false;
+    mouse_pressed_handler_ = NULL;
+    mouse_move_handler_ = NULL;
+    gesture_handler_ = NULL;
+    scroll_gesture_handler_ = NULL;
+    event_dispatch_target_ = NULL;
+    old_dispatch_target_ = NULL;
+  }
+}
+
+void RootView::OnPaint(gfx::Canvas* canvas) {
+  if (!layer() || !layer()->fills_bounds_opaquely())
+    canvas->DrawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+
+  View::OnPaint(canvas);
+}
+
+gfx::Vector2d RootView::CalculateOffsetToAncestorWithLayer(
+    ui::Layer** layer_parent) {
+  gfx::Vector2d offset(View::CalculateOffsetToAncestorWithLayer(layer_parent));
+  if (!layer() && layer_parent)
+    *layer_parent = widget_->GetLayer();
+  return offset;
+}
+
+View::DragInfo* RootView::GetDragInfo() {
+  return &drag_info_;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// RootView, private:
+
+// Input -----------------------------------------------------------------------
+
 void RootView::DispatchGestureEvent(ui::GestureEvent* event) {
   if (gesture_handler_) {
     // |gesture_handler_| (or |scroll_gesture_handler_|) can be deleted during
     // processing.
     View* handler = scroll_gesture_handler_ &&
         (event->IsScrollGestureEvent() || event->IsFlingScrollEvent())  ?
             scroll_gesture_handler_ : gesture_handler_;
     ui::GestureEvent handler_event(*event, static_cast<View*>(this), handler);
     ui::EventDispatchDetails dispatch_details =
         DispatchEvent(handler, &handler_event);
@@ skipping 116 matching lines @@
       return;
     }
 
     // The gesture event wasn't processed. Go up the view hierarchy and
     // dispatch the gesture event.
   }
 
   gesture_handler_ = NULL;
 }
 
-void RootView::ViewHierarchyChanged(
-    const ViewHierarchyChangedDetails& details) {
-  widget_->ViewHierarchyChanged(details);
-
-  if (!details.is_add) {
-    if (!explicit_mouse_handler_ && mouse_pressed_handler_ == details.child)
-      mouse_pressed_handler_ = NULL;
-    if (mouse_move_handler_ == details.child)
-      mouse_move_handler_ = NULL;
-    if (gesture_handler_ == details.child)
-      gesture_handler_ = NULL;
-    if (scroll_gesture_handler_ == details.child)
-      scroll_gesture_handler_ = NULL;
-    if (event_dispatch_target_ == details.child)
-      event_dispatch_target_ = NULL;
-    if (old_dispatch_target_ == details.child)
-      old_dispatch_target_ = NULL;
-  }
-}
-
-void RootView::VisibilityChanged(View* /*starting_from*/, bool is_visible) {
-  if (!is_visible) {
-    // When the root view is being hidden (e.g. when widget is minimized)
-    // handlers are reset, so that after it is reshown, events are not captured
-    // by old handlers.
-    explicit_mouse_handler_ = false;
-    mouse_pressed_handler_ = NULL;
-    mouse_move_handler_ = NULL;
-    gesture_handler_ = NULL;
-    scroll_gesture_handler_ = NULL;
-    event_dispatch_target_ = NULL;
-    old_dispatch_target_ = NULL;
-  }
-}
-
-void RootView::OnPaint(gfx::Canvas* canvas) {
-  if (!layer() || !layer()->fills_bounds_opaquely())
-    canvas->DrawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
-
-  View::OnPaint(canvas);
-}
-
-gfx::Vector2d RootView::CalculateOffsetToAncestorWithLayer(
-    ui::Layer** layer_parent) {
-  gfx::Vector2d offset(View::CalculateOffsetToAncestorWithLayer(layer_parent));
-  if (!layer() && layer_parent)
-    *layer_parent = widget_->GetLayer();
-  return offset;
-}
-
-View::DragInfo* RootView::GetDragInfo() {
-  return &drag_info_;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// RootView, private:
-
-// Input -----------------------------------------------------------------------
-
 void RootView::UpdateCursor(const ui::MouseEvent& event) {
   if (!(event.flags() & ui::EF_IS_NON_CLIENT)) {
     View* v = GetEventHandlerForPoint(event.location());
     ui::MouseEvent me(event, static_cast<View*>(this), v);
     widget_->SetCursor(v->GetCursor(me));
   }
 }
 
 void RootView::SetMouseLocationAndFlags(const ui::MouseEvent& event) {
   last_mouse_event_flags_ = event.flags();
@@ skipping 44 matching lines @@
 
 #ifndef NDEBUG
   DCHECK(!event_dispatch_target_ || Contains(event_dispatch_target_));
 #endif
 
   return details;
 }
 
 }  // namespace internal
 }  // namespace views