linux-aura: Fix some dragging behaviour.

ui/views/widget/desktop_aura/x11_whole_screen_move_loop.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/desktop_aura/x11_whole_screen_move_loop.h"
 
 #include <X11/Xlib.h>
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
 #undef RootWindow
 
@@ skipping 32 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ScopedCapturer);
 };
 
 }  // namespace
 
 X11WholeScreenMoveLoop::X11WholeScreenMoveLoop(
     X11WholeScreenMoveLoopDelegate* delegate)
     : delegate_(delegate),
       in_move_loop_(false),
+      should_reset_mouse_flags_(false),
       grab_input_window_(None) {
 }
 
 X11WholeScreenMoveLoop::~X11WholeScreenMoveLoop() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopRootWindowHostLinux, MessageLoop::Dispatcher implementation:
 
 bool X11WholeScreenMoveLoop::Dispatch(const base::NativeEvent& event) {
   XEvent* xev = event;
@@ skipping 43 matching lines @@
     CreateDragImageWindow();
   base::MessagePumpX11::Current()->AddDispatcherForWindow(
       this, grab_input_window_);
 
   if (!GrabPointerWithCursor(cursor))
     return false;
 
   // We are handling a mouse drag outside of the aura::RootWindow system. We
   // must manually make aura think that the mouse button is pressed so that we
   // don't draw extraneous tooltips.
-  aura::Env::GetInstance()->set_mouse_button_flags(ui::EF_LEFT_MOUSE_BUTTON);
+  aura::Env* env = aura::Env::GetInstance();
+  if (!env->IsMouseButtonDown()) {
+    env->set_mouse_button_flags(ui::EF_LEFT_MOUSE_BUTTON);
+    should_reset_mouse_flags_ = true;
+  }
 
   base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
   base::MessageLoop::ScopedNestableTaskAllower allow_nested(loop);
   base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher());
   quit_closure_ = run_loop.QuitClosure();
   run_loop.Run();
   return true;
 }
 
 void X11WholeScreenMoveLoop::UpdateCursor(gfx::NativeCursor cursor) {
   DCHECK(in_move_loop_);
   GrabPointerWithCursor(cursor);
 }
 
 void X11WholeScreenMoveLoop::EndMoveLoop() {
   if (!in_move_loop_)
     return;
 
   // We undo our emulated mouse click from RunMoveLoop();
-  aura::Env::GetInstance()->set_mouse_button_flags(0);
+  if (should_reset_mouse_flags_) {
+    aura::Env::GetInstance()->set_mouse_button_flags(0);
+    should_reset_mouse_flags_ = false;
+  }
 
   // TODO(erg): Is this ungrab the cause of having to click to give input focus
   // on drawn out windows? Not ungrabbing here screws the X server until I kill
   // the chrome process.
 
   // Ungrab before we let go of the window.
   XDisplay* display = gfx::GetXDisplay();
   XUngrabPointer(display, CurrentTime);
 
   base::MessagePumpX11::Current()->RemoveDispatcherForWindow(
@@ skipping 81 matching lines @@
   image->SetBounds(0, 0, drag_image_.width(), drag_image_.height());
   widget->SetContentsView(image);
 
   widget->Show();
   widget->GetNativeWindow()->layer()->SetFillsBoundsOpaquely(false);
 
   drag_widget_.reset(widget);
 }
 
 }  // namespace views