Implement drag and drop testing in a platform independent way.

chrome/browser/ui/panels/panel_browser_view.cc

 // 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.
 
 #include "chrome/browser/ui/panels/panel_browser_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
@@ skipping 291 matching lines @@
 }
 
 Browser* PanelBrowserView::GetPanelBrowser() const {
   return browser();
 }
 
 void PanelBrowserView::DestroyPanelBrowser() {
   DestroyBrowser();
 }
 
-NativePanelTesting* PanelBrowserView::GetNativePanelTesting() {
-  return this;
-}
-
 PanelBrowserFrameView* PanelBrowserView::GetFrameView() const {
   return static_cast<PanelBrowserFrameView*>(frame()->GetFrameView());
 }
 
 bool PanelBrowserView::OnTitleBarMousePressed(const views::MouseEvent& event) {
   if (!event.IsOnlyLeftMouseButton())
     return false;
   mouse_pressed_ = true;
   mouse_pressed_point_ = event.location();
   mouse_dragging_ = false;
@@ skipping 44 matching lines @@
   if (!mouse_pressed_)
     return false;
   mouse_pressed_ = false;
 
   if (!mouse_dragging_)
     cancelled = true;
   mouse_dragging_ = false;
   panel_->manager()->EndDragging(cancelled);
   return true;
 }
+
+// NativePanelTesting implementation.
+class NativePanelTestingWin : public NativePanelTesting {
+ public:
+  explicit NativePanelTestingWin(PanelBrowserView* panel_browser_view);
+
+ private:
+  virtual void TitlebarLeftButtonPress(gfx::Point point) OVERRIDE;
+  virtual void TitlebarLeftButtonRelease() OVERRIDE;
+  virtual void TitlebarDrag(int delta_x, int delta_y) OVERRIDE;
+  virtual void TitlebarCancelDrag() OVERRIDE;
+  virtual void TitlebarFinishDrag() OVERRIDE;
+
+  PanelBrowserView* panel_browser_view_;
+};
+
+NativePanelTesting* NativePanelTesting::Create(NativePanel* native_panel) {
+  return new NativePanelTestingWin(static_cast<PanelBrowserView*>(
+      native_panel));
+}
+
+NativePanelTestingWin::NativePanelTestingWin(
+    PanelBrowserView* panel_browser_view) :
+    panel_browser_view_(panel_browser_view) {
+}
+
+void NativePanelTestingWin::TitlebarLeftButtonPress(gfx::Point point) {
+  views::MouseEvent pressed(ui::ET_MOUSE_PRESSED, point.x(), point.y(),
+                            ui::EF_LEFT_BUTTON_DOWN);
+  panel_browser_view_->OnTitleBarMousePressed(pressed);

[jianli, 2011/08/09 21:10:23]

It seems to me that we can refactor PanelBrowserView::OnTitleBarMousePressed and
other related methods a little bit to simplify the testing code, like:

void PanelBrowserView::OnTitleBarMousePressed(const gfx::Point& point) {
  mouse_pressed_ = true;
  mouse_pressed_point_ = event.location();
  mouse_dragging_ = false;
}

void NativePanelTestingWin::TitlebarLeftMouseButtonPressed(const gfx::Point&
point) {
  panel_browser_view_->OnTitleBarMousePressed(pressed);
}

We need to change the class PanelBrowserFrameView to pass the point directly.

[prasadt, 2011/08/09 23:05:04]

Wouldn't it be better to leave it the way it is in case we need something else
from the MouseEvent object later on?

[jianli, 2011/08/09 23:24:16]

I rather worry about it later since it is more important to reduce the
testing-specific code size by sharing the common code.

[prasadt, 2011/08/09 23:49:41]

I started making the change and then saw that you're using MouseEvent in
PanelBrowserView::OnTitlebarMousePressed() method implementation:

if (!event.IsOnlyLeftMouseButton())

I can change the other methods but then they won't be consistent in their
signatures.  Let me know what you think.

[prasadt, 2011/08/11 00:26:41]

Made the changes following our offline chat.  Please take a look at the latest
changes.  Thanks.

+}
+
+void NativePanelTestingWin::TitlebarLeftButtonRelease() {
+  views::MouseEvent released(ui::ET_MOUSE_RELEASED, 0, 0, 0);
+  panel_browser_view_->OnTitleBarMouseReleased(released);
+}
+
+void NativePanelTestingWin::TitlebarDrag(int delta_x, int delta_y) {
+  gfx::Rect current_bounds = panel_browser_view_->GetRestoredBounds();
+  views::MouseEvent dragged(ui::ET_MOUSE_DRAGGED,
+                            current_bounds.x() + delta_x,
+                            current_bounds.y() + delta_y,
+                            ui::EF_LEFT_BUTTON_DOWN);
+  panel_browser_view_->OnTitleBarMouseDragged(dragged);
+}
+
+void NativePanelTestingWin::TitlebarCancelDrag() {
+  panel_browser_view_->OnTitleBarMouseCaptureLost();
+}
+
+void NativePanelTestingWin::TitlebarFinishDrag() {
+  views::MouseEvent released(ui::ET_MOUSE_RELEASED, 0, 0, 0);
+  panel_browser_view_->OnTitleBarMouseReleased(released);
+}