Enable hidpi on Linux, refactor a bit on Windows to share

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 82992004885347d68a8464bc06bdca5af5528c1d..14e9847df1e3971ed7135b0b7f5af80b23c3b641 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -13,6 +13,7 @@
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/dpi.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
@@ -38,7 +39,6 @@
 
 #if defined(OS_WIN)
 #include "ui/base/win/internal_constants.h"
-#include "ui/gfx/win/dpi.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
 
@@ -2074,7 +2074,7 @@ void MenuController::RepostEvent(SubmenuView* source,
   // try to repost with Win32 if the window under the mouse press is in metro.
   if (!ViewsDelegate::views_delegate ||
       !ViewsDelegate::views_delegate->IsWindowInMetro(window)) {
-    gfx::Point screen_loc_pixels = gfx::win::DIPToScreenPoint(screen_loc);
+    gfx::Point screen_loc_pixels = gfx::DIPToScreenPoint(screen_loc);
     HWND target_window = window ? HWNDForNativeWindow(window) :
                                   WindowFromPoint(screen_loc_pixels.ToPOINT());
     HWND source_window = HWNDForNativeView(native_view);