Revert 131761 - Mouse events, touch events, or both can be locked to a target.

Broke Win-Aura compile.

NativeWidgetPrivate and Window event capture related commands now take a 
set of flags, indicating what event types to lock. Current options are 
CW_LOCK_MOUSE and CW_LOCK_TOUCH.

BUG=117554
TEST=WindowTest.TouchCaptureTests, WindowTest.CaptureTests


Review URL: http://codereview.chromium.org/9838011

TBR=tdresser@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10052012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131762 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index db69d23..8c14eb0 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -338,16 +338,16 @@ void NativeWidgetAura::SendNativeAccessibilityEvent(
   //NOTIMPLEMENTED();
 }
 
-void NativeWidgetAura::SetCapture(unsigned int flags) {
-  window_->SetCapture(flags);
+void NativeWidgetAura::SetMouseCapture() {
+  window_->SetCapture();
 }
 
-void NativeWidgetAura::ReleaseCapture() {
+void NativeWidgetAura::ReleaseMouseCapture() {
   window_->ReleaseCapture();
 }
 
-bool NativeWidgetAura::HasCapture(unsigned int flags) const {
-  return window_->HasCapture(flags);
+bool NativeWidgetAura::HasMouseCapture() const {
+  return window_->HasCapture();
 }
 
 InputMethod* NativeWidgetAura::CreateInputMethod() {
@@ -664,7 +664,7 @@ void NativeWidgetAura::SetInactiveRenderingDisabled(bool value) {
 Widget::MoveLoopResult NativeWidgetAura::RunMoveLoop() {
   if (window_->parent() &&
       aura::client::GetWindowMoveClient(window_->parent())) {
-    SetCapture(ui::CW_LOCK_MOUSE);
+    SetMouseCapture();
     aura::client::GetWindowMoveClient(window_->parent())->RunMoveLoop(window_);
     return Widget::MOVE_LOOP_SUCCESSFUL;
   }