Refactor Windows DPI Point, Rect, and Size for Multiple Monitor DPI Awareness

ui/views/corewm/tooltip_win.cc

 // Copyright 2013 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 "ui/views/corewm/tooltip_win.h"
 
 #include <winuser.h>
 
 #include "base/debug/stack_trace.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/screen.h"
-#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/screen_win.h"
 #include "ui/views/corewm/cursor_height_provider_win.h"
 
 namespace views {
 namespace corewm {
 
 TooltipWin::TooltipWin(HWND parent)
     : parent_hwnd_(parent),
       tooltip_hwnd_(NULL),
       showing_(false) {
   memset(&toolinfo_, 0, sizeof(toolinfo_));
@@ skipping 44 matching lines @@
   }
 
   l10n_util::AdjustUIFontForWindow(tooltip_hwnd_);
 
   SendMessage(tooltip_hwnd_, TTM_ADDTOOL, 0,
               reinterpret_cast<LPARAM>(&toolinfo_));
   return true;
 }
 
 void TooltipWin::PositionTooltip() {
-  // This code only runs for non-metro, so GetNativeScreen() is fine.
-  gfx::Point screen_point = gfx::win::DIPToScreenPoint(location_);
+  gfx::Point screen_point = gfx::ScreenWin::DIPToScreenPoint(location_);
   const int cursoroffset = GetCurrentCursorVisibleHeight();
   screen_point.Offset(0, cursoroffset);
 
   DWORD tooltip_size = SendMessage(tooltip_hwnd_, TTM_GETBUBBLESIZE, 0,
                                    reinterpret_cast<LPARAM>(&toolinfo_));
   const gfx::Size size(LOWORD(tooltip_size), HIWORD(tooltip_size));
 
+  // This code only runs for non-metro, so GetNativeScreen() is fine.
   const gfx::Display display(
-      gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(screen_point));
+      gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(location_));
 
   gfx::Rect tooltip_bounds(screen_point, size);
-  tooltip_bounds.AdjustToFit(gfx::win::DIPToScreenRect(display.work_area()));
+  tooltip_bounds.AdjustToFit(
+      gfx::ScreenWin::DIPToScreenRect(parent_hwnd_, display.work_area()));
   SetWindowPos(tooltip_hwnd_, NULL, tooltip_bounds.x(), tooltip_bounds.y(), 0,
                0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
 }
 
 int TooltipWin::GetMaxWidth(const gfx::Point& location,
                             aura::Window* context) const {
   // This code only runs for non-metro, so GetNativeScreen() is fine.
-  const gfx::Point screen_point = gfx::win::DIPToScreenPoint(location);
+  const gfx::Point screen_point = gfx::ScreenWin::DIPToScreenPoint(location);
   gfx::Display display(
       gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(screen_point));
   const gfx::Rect monitor_bounds = display.bounds();
   return (monitor_bounds.width() + 1) / 2;
 }
 
 void TooltipWin::SetText(aura::Window* window,
                          const base::string16& tooltip_text,
                          const gfx::Point& location) {
   if (!EnsureTooltipWindow())
@@ skipping 35 matching lines @@
   SendMessage(tooltip_hwnd_, TTM_TRACKACTIVATE, FALSE,
               reinterpret_cast<LPARAM>(&toolinfo_));
 }
 
 bool TooltipWin::IsVisible() {
   return showing_;
 }
 
 }  // namespace corewm
 }  // namespace views