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

ui/views/controls/menu/menu_controller.cc

Index: ui/views/controls/menu/menu_controller.cc
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index b3a6adacecfd3197cc01a845b7e06019ed13fdbe..b7c0b88e0cf7ebec46817ed1a085d2859237e3a8 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -38,7 +38,7 @@
 
 #if defined(OS_WIN)
 #include "ui/base/win/internal_constants.h"
-#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/screen_win.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
 
@@ -2256,7 +2256,7 @@ void MenuController::RepostEvent(SubmenuView* source,
   // try to repost with Win32 if the window under the mouse press is in metro.
   if (!ViewsDelegate::GetInstance() ||
       !ViewsDelegate::GetInstance()->IsWindowInMetro(window)) {
-    gfx::Point screen_loc_pixels = gfx::win::DIPToScreenPoint(screen_loc);
+    gfx::Point screen_loc_pixels = gfx::ScreenWin::DIPToScreenPoint(screen_loc);
     HWND target_window = window ? HWNDForNativeWindow(window) :
                                   WindowFromPoint(screen_loc_pixels.ToPOINT());
     HWND source_window = HWNDForNativeView(native_view);