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

chrome/browser/extensions/display_info_provider_win.cc

 // Copyright 2014 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/extensions/display_info_provider_win.h"
 
 #include <windows.h>
 
 #include "base/hash.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/win_util.h"
 #include "extensions/common/api/system_display.h"
+#include "ui/gfx/dpi.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
-#include "ui/gfx/win/dpi.h"
 
 namespace extensions {
 
 using core_api::system_display::DisplayUnitInfo;
 
 namespace {
 
 BOOL CALLBACK
 EnumMonitorCallback(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM data) {
   DisplayInfo* all_displays = reinterpret_cast<DisplayInfo*>(data);
@@ skipping 58 matching lines @@
   // TODO(scottmg): native screen is wrong http://crbug.com/133312
   return gfx::Screen::GetNativeScreen();
 }
 
 // static
 DisplayInfoProvider* DisplayInfoProvider::Create() {
   return new DisplayInfoProviderWin();
 }
 
 }  // namespace extensions