NOT FOR SUBMIT - Windows Views HiDPI

chrome/browser/ui/views/tabs/dragged_tab_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/views/tabs/dragged_tab_view.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/ui/views/tabs/native_view_photobooth.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/views/widget/native_widget_aura.h"
 #elif defined(OS_WIN)
+#include "ui/base/win/dpi.h"
 #include "ui/views/widget/native_widget_win.h"
 #endif
 
 static const int kTransparentAlpha = 200;
 static const int kOpaqueAlpha = 255;
 static const int kDragFrameBorderSize = 2;
 static const int kTwiceDragFrameBorderSize = 2 * kDragFrameBorderSize;
 static const float kScalingFactor = 0.5;
 static const SkColor kDraggedTabBorderColor = SkColorSetRGB(103, 129, 162);
 
@@ skipping 47 matching lines @@
     // On RTL locales, a dragged tab (when it is not attached to a tab strip)
     // is rendered using a right-to-left orientation so we should calculate the
     // window position differently.
     gfx::Size ps = GetPreferredSize();
     x = screen_point.x() + ScaleValue(mouse_tab_offset_.x() - ps.width());
   } else {
     x = screen_point.x() - ScaleValue(mouse_tab_offset_.x());
   }
   int y = screen_point.y() - ScaleValue(mouse_tab_offset_.y());
 
+#if defined(OS_WIN)

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

Has this change been tested on Aura?  If for non-Aura Windows, perhaps it should
be moved into the following conditional block.

[girard, 2013/06/03 22:31:55]

Done.

+  double scale = ui::win::GetDeviceScaleFactor();
+  x = static_cast<int>(scale * screen_point.x());
+  y = static_cast<int>(scale * screen_point.y());
+#endif
 #if defined(OS_WIN) && !defined(USE_AURA)
   // TODO(beng): make this cross-platform
   int show_flags = container_->IsVisible() ? SWP_NOZORDER : SWP_SHOWWINDOW;
   SetWindowPos(container_->GetNativeView(), HWND_TOP, x, y, 0, 0,
                SWP_NOSIZE | SWP_NOACTIVATE | show_flags);
 #else
   gfx::Rect bounds = container_->GetWindowBoundsInScreen();
   container_->SetBounds(gfx::Rect(x, y, bounds.width(), bounds.height()));
   if (!container_->IsVisible())
     container_->Show();
@@ skipping 86 matching lines @@
 }
 
 gfx::Size DraggedTabView::PreferredContainerSize() {
   gfx::Size ps = GetPreferredSize();
   return gfx::Size(ScaleValue(ps.width()), ScaleValue(ps.height()));
 }
 
 int DraggedTabView::ScaleValue(int value) {
   return static_cast<int>(value * kScalingFactor);
 }