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

chrome/app/chrome_exe_main_win.cc

 // Copyright (c) 2011 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 <windows.h>
 #include <tchar.h>
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/win/windows_version.h"
 #include "chrome/app/client_util.h"
 #include "chrome/browser/chrome_process_finder_win.h"
 #include "chrome/browser/policy/policy_path_parser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_elf/chrome_elf_main.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 #include "content/public/common/result_codes.h"
-#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/dpi.h"
 
 namespace {
 
 void CheckSafeModeLaunch() {
   unsigned short k1 = ::GetAsyncKeyState(VK_CONTROL);
   unsigned short k2 = ::GetAsyncKeyState(VK_MENU);
   const unsigned short kPressedMask = 0x8000;
   if ((k1 & kPressedMask) && (k2 & kPressedMask))
     ::SetEnvironmentVariableA(chrome::kSafeModeEnvVar, "1");
 }
@@ skipping 61 matching lines @@
 
   // Initialize the commandline singleton from the environment.
   CommandLine::Init(0, NULL);
   // The exit manager is in charge of calling the dtors of singletons.
   base::AtExitManager exit_manager;
 
   // We don't want to set DPI awareness on Vista because we don't support
   // DirectWrite there. GDI fonts are kerned very badly, so better to leave
   // DPI-unaware and at effective 1.0. See also ShouldUseDirectWrite().
   if (base::win::GetVersion() > base::win::VERSION_VISTA)
-    gfx::EnableHighDPISupport();
+    gfx::win::EnableHighDPISupport();
 
   if (AttemptFastNotify(*CommandLine::ForCurrentProcess()))
     return 0;
 
   CheckSafeModeLaunch();
 
   // Load and launch the chrome dll. *Everything* happens inside.
   MainDllLoader* loader = MakeMainDllLoader();
   int rc = loader->Launch(instance);
   loader->RelaunchChromeBrowserWithNewCommandLineIfNeeded();
   delete loader;
   return rc;
 }