MacViewsBrowser: TabDragging / simplifications

chrome/test/base/interactive_test_utils.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 CHROME_TEST_BASE_INTERACTIVE_TEST_UTILS_H_
 #define CHROME_TEST_BASE_INTERACTIVE_TEST_UTILS_H_
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/base/test/ui_controls.h"
@@ skipping 11 matching lines @@
 // Moves the mouse to the |from| position, presses left mouse button,
 // then moves mouse to the |to| position and releases left mouse button.
 // |steps| indicates number of intermediate points that are interpolated between
 // |from| and |to|.
 void DragAndDrop(const gfx::Point& from, const gfx::Point& to, int steps = 1);
 
 class DragAndDropOperation {
  public:
   enum class Type {
     Move,
-    MoveWithoutAck,
     MouseDown,
     MouseUp,
     SetMousePositionOverride,
     UnsetMousePositionOverride,
     DebugDelay
   };
 
   static DragAndDropOperation Move(const gfx::Point& p);
-  // Doesn't wait for the event to finish processing, instead it waits for
-  // |delay|.
-  static DragAndDropOperation MoveWithoutAck(const gfx::Point& p,
-                                             const base::TimeDelta& delay);
   static DragAndDropOperation MouseDown();
   static DragAndDropOperation MouseUp();
   static DragAndDropOperation SetMousePositionOverride(const gfx::Point& p);
   static DragAndDropOperation UnsetMousePositionOverride();
+  // comment
   static DragAndDropOperation DebugDelay();
 
   Type type() const { return type_; }
   const gfx::Point& point() const { return point_; }
-  const base::TimeDelta& delay() const { return delay_; }
 
  private:
-  DragAndDropOperation(Type type,
-                       const gfx::Point& p,
-                       const base::TimeDelta& delay = base::TimeDelta())
-      : type_(type), point_(p), delay_(delay) {}
+  DragAndDropOperation(Type type, const gfx::Point& p)
+      : type_(type), point_(p) {}
 
   Type type_;
   gfx::Point point_;
-  base::TimeDelta delay_;
 };
 
 // Performs a series of drag-and-drop operations on a background thread, while
 // spinning a RunLoop on the main thread. If there are nested eventloops on the
 // main thread's queue, our helper RunLoop won't quit and we'll get stuck.
 // BridgedNativeWidget::RunMoveLoop() creates a RunLoop, so we need to ensure
 // that Drag'n'Drop is finished before trying to return from the function.
 void DragAndDrop(const std::list<DragAndDropOperation>& operations);
 #endif  // OS_MACOSX
 
@@ skipping 119 matching lines @@
 // ui_controls_linux.cc and ui_controls_mac.cc
 void ClickTask(ui_controls::MouseButton button,
                int state,
                const base::Closure& followup);
 
 }  // namespace internal
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_BASE_INTERACTIVE_TEST_UTILS_H_