Change panel drag related methods to use mouse location in screen coordinates.

chrome/browser/ui/panels/panel_browser_view.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 "chrome/browser/ui/panels/panel_browser_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/native_window_notification_source.h"
 #include "chrome/browser/ui/panels/panel.h"
@@ skipping 409 matching lines @@
                  SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 PanelBrowserFrameView* PanelBrowserView::GetFrameView() const {
   return static_cast<PanelBrowserFrameView*>(frame()->GetFrameView());
 }
 
-bool PanelBrowserView::OnTitlebarMousePressed(const gfx::Point& location) {
-  // |location| is in the view's coordinate system. Convert it to the screen
-  // coordinate system.
-  mouse_location_ = location;
-  views::View::ConvertPointToScreen(this, &mouse_location_);
-
+bool PanelBrowserView::OnTitlebarMousePressed(
+    const gfx::Point& mouse_location) {
   mouse_pressed_ = true;
   mouse_pressed_time_ = base::TimeTicks::Now();
   mouse_dragging_state_ = NO_DRAGGING;
+  mouse_location_ = mouse_location;
   return true;
 }
 
-bool PanelBrowserView::OnTitlebarMouseDragged(const gfx::Point& location) {
+bool PanelBrowserView::OnTitlebarMouseDragged(
+    const gfx::Point& mouse_location) {
   if (!mouse_pressed_)
     return false;
 
   if (!panel_->draggable())
     return true;
 
   gfx::Point last_mouse_location = mouse_location_;
-
-  // |location| is in the view's coordinate system. Convert it to the screen
-  // coordinate system.
-  mouse_location_ = location;
-  views::View::ConvertPointToScreen(this, &mouse_location_);
+  mouse_location_ = mouse_location;
 
   int delta_x = mouse_location_.x() - last_mouse_location.x();
   int delta_y = mouse_location_.y() - last_mouse_location.y();
   if (mouse_dragging_state_ == NO_DRAGGING &&
       ExceededDragThreshold(delta_x, delta_y)) {
     // When a drag begins, we do not want to the client area to still receive
     // the focus.
     old_focused_view_ = GetFocusManager()->GetFocusedView();
     GetFocusManager()->SetFocusedView(GetFrameView());
 
-    panel_->manager()->StartDragging(panel_.get());
+    panel_->manager()->StartDragging(panel_.get(), last_mouse_location);
     mouse_dragging_state_ = DRAGGING_STARTED;
   }
   if (mouse_dragging_state_ == DRAGGING_STARTED)
-    panel_->manager()->Drag(delta_x, delta_y);
+    panel_->manager()->Drag(mouse_location_);
   return true;
 }
 
 bool PanelBrowserView::OnTitlebarMouseReleased() {
   if (mouse_dragging_state_ == DRAGGING_STARTED) {
     // When a drag ends, restore the focus.
     if (old_focused_view_) {
       GetFocusManager()->SetFocusedView(old_focused_view_);
       old_focused_view_ = NULL;
     }
@@ skipping 63 matching lines @@
 #endif
 }
 
 // NativePanelTesting implementation.
 class NativePanelTestingWin : public NativePanelTesting {
  public:
   explicit NativePanelTestingWin(PanelBrowserView* panel_browser_view);
 
  private:
   virtual void PressLeftMouseButtonTitlebar(
-      const gfx::Point& point) OVERRIDE;
+      const gfx::Point& mouse_location) OVERRIDE;
   virtual void ReleaseMouseButtonTitlebar() OVERRIDE;
-  virtual void DragTitlebar(int delta_x, int delta_y) OVERRIDE;
+  virtual void DragTitlebar(const gfx::Point& mouse_location) OVERRIDE;
   virtual void CancelDragTitlebar() OVERRIDE;
   virtual void FinishDragTitlebar() OVERRIDE;
   virtual bool VerifyDrawingAttention() const OVERRIDE;
   virtual bool VerifyActiveState(bool is_active) OVERRIDE;
   virtual bool IsWindowSizeKnown() const OVERRIDE;
   virtual bool IsAnimatingBounds() const OVERRIDE;
 
   PanelBrowserView* panel_browser_view_;
 };
 
 // static
 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) {
   PanelBrowserFrameView* frame_view = panel_browser_view_->GetFrameView();
   frame_view->title_label_->SetAutoColorReadabilityEnabled(false);
 }
 
 void NativePanelTestingWin::PressLeftMouseButtonTitlebar(
-    const gfx::Point& point) {
-  panel_browser_view_->OnTitlebarMousePressed(point);
+    const gfx::Point& mouse_location) {
+  panel_browser_view_->OnTitlebarMousePressed(mouse_location);
 }
 
 void NativePanelTestingWin::ReleaseMouseButtonTitlebar() {
   panel_browser_view_->OnTitlebarMouseReleased();
 }
 
-void NativePanelTestingWin::DragTitlebar(int delta_x, int delta_y) {
-  gfx::Point new_mouse_location = panel_browser_view_->mouse_location_;
-  new_mouse_location.Offset(delta_x, delta_y);
-
-  // Convert from the screen coordinate system to the view's coordinate system
-  // since OnTitlebarMouseDragged takes the point in the latter.
-  views::View::ConvertPointToView(NULL, panel_browser_view_,
-                                  &new_mouse_location);
-  panel_browser_view_->OnTitlebarMouseDragged(new_mouse_location);
+void NativePanelTestingWin::DragTitlebar(const gfx::Point& mouse_location) {
+  panel_browser_view_->OnTitlebarMouseDragged(mouse_location);
 }
 
 void NativePanelTestingWin::CancelDragTitlebar() {
   panel_browser_view_->OnTitlebarMouseCaptureLost();
 }
 
 void NativePanelTestingWin::FinishDragTitlebar() {
   panel_browser_view_->OnTitlebarMouseReleased();
 }
 
@@ skipping 18 matching lines @@
 }
 
 bool NativePanelTestingWin::IsWindowSizeKnown() const {
   return true;
 }
 
 bool NativePanelTestingWin::IsAnimatingBounds() const {
   return panel_browser_view_->bounds_animator_.get() &&
          panel_browser_view_->bounds_animator_->is_animating();
 }