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

chrome/browser/ui/panels/panel_browser_window_cocoa.mm

 // 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_window_cocoa.h"
 
 #include "base/logging.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
+#import "chrome/browser/ui/panels/panel_utils_cocoa.h"
 #import "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 
 using content::WebContents;
 
 namespace {
 
 // Use this instead of 0 for minimum size of a window when doing opening and
 // closing animations, since OSX window manager does not like 0-sized windows
 // (according to avi@).
 const int kMinimumWindowSize = 1;
 
-// TODO(dcheng): Move elsewhere so BrowserWindowCocoa can use them too.
-// Converts global screen coordinates in platfrom-independent coordinates
-// (with the (0,0) in the top-left corner of the primary screen) to the Cocoa
-// screen coordinates (with (0,0) in the low-left corner).
-NSRect ConvertCoordinatesToCocoa(const gfx::Rect& bounds) {
-  // Flip coordinates based on the primary screen.
-  NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
-
-  return NSMakeRect(
-      bounds.x(), NSHeight([screen frame]) - bounds.height() - bounds.y(),
-      bounds.width(), bounds.height());
-}
-
 }  // namespace
 
 // This creates a shim window class, which in turn creates a Cocoa window
 // controller which in turn creates actual NSWindow by loading a nib.
 // Overall chain of ownership is:
 // PanelWindowControllerCocoa -> PanelBrowserWindowCocoa -> Panel.
 NativePanel* Panel::CreateNativePanel(Browser* browser, Panel* panel,
                                       const gfx::Rect& bounds) {
   return new PanelBrowserWindowCocoa(browser, panel, bounds);
 }
@@ skipping 38 matching lines @@
   // Browser calls this several times, meaning 'ensure it's shown'.
   // Animations don't look good when repeated - hence this flag is needed.
   if (is_shown_) {
     return;
   }
   // A call to SetPanelBounds() before showing it is required to set
   // the panel frame properly.
   SetPanelBoundsInstantly(bounds_);
   is_shown_ = true;
 
-  NSRect finalFrame = ConvertCoordinatesToCocoa(bounds_);
+  NSRect finalFrame = cocoa_utils::ConvertRectToCocoaCoordinates(bounds_);
   [controller_ revealAnimatedWithFrame:finalFrame];
 }
 
 gfx::Rect PanelBrowserWindowCocoa::GetPanelBounds() const {
   return bounds_;
 }
 
 // |bounds| is the platform-independent screen coordinates, with (0,0) at
 // top-left of the primary screen.
 void PanelBrowserWindowCocoa::SetPanelBounds(const gfx::Rect& bounds) {
   setBoundsInternal(bounds, true);
 }
 
 void PanelBrowserWindowCocoa::SetPanelBoundsInstantly(const gfx::Rect& bounds) {
   setBoundsInternal(bounds, false);
 }
 
 void PanelBrowserWindowCocoa::setBoundsInternal(const gfx::Rect& bounds,
                                                 bool animate) {
   // We will call SetPanelBoundsInstantly() once before showing the panel
   // and it should set the panel frame correctly.
   if (bounds_ == bounds && is_shown_)
     return;
 
   bounds_ = bounds;
 
-  NSRect frame = ConvertCoordinatesToCocoa(bounds);
+  NSRect frame = cocoa_utils::ConvertRectToCocoaCoordinates(bounds);
   [controller_ setPanelFrame:frame animate:animate];
 }
 
 void PanelBrowserWindowCocoa::ClosePanel() {
   if (isClosed())
       return;
 
   NSWindow* window = [controller_ window];
   [window performClose:controller_];
 }
@@ skipping 170 matching lines @@
                                             int index) {
   [controller_ tabDetached:contents->web_contents()];
 }
 
 // NativePanelTesting implementation.
 class NativePanelTestingCocoa : public NativePanelTesting {
  public:
   NativePanelTestingCocoa(NativePanel* native_panel);
   virtual ~NativePanelTestingCocoa() { }
   // Overridden from NativePanelTesting
-  virtual void PressLeftMouseButtonTitlebar(const gfx::Point& point) OVERRIDE;
+  virtual void PressLeftMouseButtonTitlebar(
+      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;
 
  private:
   PanelTitlebarViewCocoa* titlebar() const;
   // Weak, assumed always to outlive this test API object.
   PanelBrowserWindowCocoa* native_panel_window_;
 };
 
 // static
 NativePanelTesting* NativePanelTesting::Create(NativePanel* native_panel) {
   return new NativePanelTestingCocoa(native_panel);
 }
 
 NativePanelTestingCocoa::NativePanelTestingCocoa(NativePanel* native_panel)
   : native_panel_window_(static_cast<PanelBrowserWindowCocoa*>(native_panel)) {
 }
 
 PanelTitlebarViewCocoa* NativePanelTestingCocoa::titlebar() const {
   return [native_panel_window_->controller_ titlebarView];
 }
 
 void NativePanelTestingCocoa::PressLeftMouseButtonTitlebar(
-  const gfx::Point& point) {
-  [titlebar() pressLeftMouseButtonTitlebar];
+    const gfx::Point& mouse_location) {
+  // Convert from platform-indepedent screen coordinates to Cocoa's screen
+  // coordinates because PanelTitlebarViewCocoa method takes Cocoa's screen
+  // coordinates.
+  [titlebar() pressLeftMouseButtonTitlebar:
+      cocoa_utils::ConvertPointToCocoaCoordinates(mouse_location)];
 }
 
 void NativePanelTestingCocoa::ReleaseMouseButtonTitlebar() {
   [titlebar() releaseLeftMouseButtonTitlebar];
 }
 
-void NativePanelTestingCocoa::DragTitlebar(int delta_x, int delta_y) {
-  [titlebar() dragTitlebarDeltaX:delta_x deltaY:delta_y];
+void NativePanelTestingCocoa::DragTitlebar(const gfx::Point& mouse_location) {
+  // Convert from platform-indepedent screen coordinates to Cocoa's screen
+  // coordinates because PanelTitlebarViewCocoa method takes Cocoa's screen
+  // coordinates.
+  [titlebar() dragTitlebar:
+      cocoa_utils::ConvertPointToCocoaCoordinates(mouse_location)];
 }
 
 void NativePanelTestingCocoa::CancelDragTitlebar() {
   [titlebar() cancelDragTitlebar];
 }
 
 void NativePanelTestingCocoa::FinishDragTitlebar() {
   [titlebar() finishDragTitlebar];
 }
 
 bool NativePanelTestingCocoa::VerifyDrawingAttention() const {
   return [titlebar() isDrawingAttention];
 }
 
 bool NativePanelTestingCocoa::VerifyActiveState(bool is_active) {
   // TODO(jianli): to be implemented.
   return false;
 }
 
 bool NativePanelTestingCocoa::IsWindowSizeKnown() const {
   return true;
 }
 
 bool NativePanelTestingCocoa::IsAnimatingBounds() const {
   return [native_panel_window_->controller_ isAnimatingBounds];
 }