Consolidate Widget Event code, other cleanup.

views/widget/native_widget.h

 // Copyright (c) 2011 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.
 
 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_H_
 #define VIEWS_WIDGET_NATIVE_WIDGET_H_
 #pragma once
 
 #include <set>
 
@@ skipping 52 matching lines @@
   virtual void* GetNativeWindowProperty(const char* name) = 0;
 
   // Returns the native widget's tooltip manager. Called from the View hierarchy
   // to update tooltips.
   virtual TooltipManager* GetTooltipManager() const = 0;
 
   // Returns true if a system screen reader is active for the NativeWidget.
   virtual bool IsScreenReaderActive() const = 0;
 
   // Sets or releases event capturing for this native widget.
-  virtual void SetNativeCapture() = 0;
-  virtual void ReleaseNativeCapture() = 0;
+  virtual void SetMouseCapture() = 0;
+  virtual void ReleaseMouseCapture() = 0;
 
   // Returns true if this native widget is capturing all events.
-  virtual bool HasNativeCapture() const = 0;
+  virtual bool HasMouseCapture() const = 0;
 
  protected:
   friend class Widget;
 
   // Returns a handle for the underlying native widget that can be used for
   // accelerated drawing.
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;
 
   // Widget pass-thrus, private to Views. --------------------------------------
   // See method documentation in Widget.
@@ skipping 15 matching lines @@
   virtual void RunShellDrag(View* view,
                             const ui::OSExchangeData& data,
                             int operation) = 0;
   virtual void SchedulePaintInRect(const gfx::Rect& rect) = 0;
   virtual void SetCursor(gfx::NativeCursor cursor) = 0;
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_NATIVE_WIDGET_H_