NOT FOR SUBMIT - Windows Views HiDPI

chrome/browser/ui/views/tabs/tab_drag_controller.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/views/tabs/tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/auto_reset.h"
@@ skipping 38 matching lines @@
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/gestures/gesture_recognizer.h"
 #endif
 
+#if defined(OS_WIN)
+#include "ui/base/win/dpi.h"
+#endif
+
 using content::OpenURLParams;
 using content::UserMetricsAction;
 using content::WebContents;
 
 static const int kHorizontalMoveThreshold = 16;  // Pixels.
 
 // Distance from the next/previous stacked before before we consider the tab
 // close enough to trigger moving.
 static const int kStackedDistance = 36;
 
@@ skipping 140 matching lines @@
       switches::kTabBrowserDragging);
 #endif
 }
 
 // Returns true if |bounds| contains the y-coordinate |y|. The y-coordinate
 // of |bounds| is adjusted by |vertical_adjustment|.
 bool DoesRectContainVerticalPointExpanded(
     const gfx::Rect& bounds,
     int vertical_adjustment,
     int y) {
-  int upper_threshold = bounds.bottom() + vertical_adjustment;
-  int lower_threshold = bounds.y() - vertical_adjustment;
+#if defined(OS_WIN)

[kevers, 2013/06/03 17:28:50]

Looks like we're mixing pixels and DIP in arguments to the method.  If this is
so, then maybe we should be adjusting the caller. Looks very error prone to
leave expecting mixed coordinates.  Has this been tested on Win Aura?

+  static float scale = ui::win::GetDeviceScaleFactor();
+#else
+  static float scale = 1.0;
+#endif
+  int upper_threshold = bounds.bottom() + scale * vertical_adjustment;
+  int lower_threshold = bounds.y() - scale * vertical_adjustment;
   return y >= lower_threshold && y <= upper_threshold;
 }
 
 // WidgetObserver implementation that resets the window position managed
 // property on Show.
 // We're forced to do this here since BrowserFrameAura resets the 'window
 // position managed' property during a show and we need the property set to
 // false before WorkspaceLayoutManager2 sees the visibility change.
 class WindowPositionManagedUpdater : public views::WidgetObserver {
  public:
@@ skipping 1840 matching lines @@
 gfx::Vector2d TabDragController::GetWindowOffset(
     const gfx::Point& point_in_screen) {
   TabStrip* owning_tabstrip = (attached_tabstrip_ && detach_into_browser_) ?
       attached_tabstrip_ : source_tabstrip_;
   views::View* toplevel_view = owning_tabstrip->GetWidget()->GetContentsView();
 
   gfx::Point point = point_in_screen;
   views::View::ConvertPointFromScreen(toplevel_view, &point);
   return point.OffsetFromOrigin();
 }