Revert of Do not interchange MOUSE_MOVED and MOUSE_DRAGGED events in Widget

ui/views/widget/widget.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
 #define UI_VIEWS_WIDGET_WIDGET_H_
 
 #include <set>
 #include <stack>
 #include <vector>
@@ skipping 902 matching lines @@
 
   // See |is_top_level()| accessor.
   bool is_top_level_;
 
   // Tracks whether native widget has been initialized.
   bool native_widget_initialized_;
 
   // Whether native widget has been destroyed.
   bool native_widget_destroyed_;
 
+  // TODO(beng): Remove NativeWidgetGtk's dependence on these:
+  // If true, the mouse is currently down.
+  bool is_mouse_button_pressed_;
+
   // True if capture losses should be ignored.
   bool ignore_capture_loss_;
 
+  // TODO(beng): Remove NativeWidgetGtk's dependence on these:
   // The following are used to detect duplicate mouse move events and not
   // deliver them. Displaying a window may result in the system generating
   // duplicate move events even though the mouse hasn't moved.
-  // TODO(tdanderson): We may be able to remove these members.
   bool last_mouse_event_was_move_;
   gfx::Point last_mouse_event_position_;
 
   // True if event capture should be released on a mouse up event. Default is
   // true.
   bool auto_release_capture_;
 
   // See description in GetRootLayers().
   std::vector<ui::Layer*> root_layers_;
 
   // Is |root_layers_| out of date?
   bool root_layers_dirty_;
 
   // True when window movement via mouse interaction with the frame should be
   // disabled.
   bool movement_disabled_;
 
   ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_