Remove last dependencies on ui/base from ui/gfx

chrome/browser/chrome_browser_main_win.cc

 // Copyright (c) 2012 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/chrome_browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 29 matching lines @@
 #include "chrome/installer/util/shell_util.h"
 #include "content/public/common/main_function_params.h"
 #include "grit/app_locale_settings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "installer_util_strings/installer_util_strings.h"
 #include "ui/base/cursor/cursor_loader_win.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/base/win/dpi_setup.h"
 #include "ui/base/win/message_box_win.h"
 #include "ui/gfx/platform_font_win.h"
 
 namespace {
 
 typedef HRESULT (STDAPICALLTYPE* RegisterApplicationRestartProc)(
     const wchar_t* command_line,
     DWORD flags);
 
 void InitializeWindowProcExceptions() {
@@ skipping 134 matching lines @@
 void ChromeBrowserMainPartsWin::PreMainMessageLoopStart() {
   // installer_util references strings that are normally compiled into
   // setup.exe.  In Chrome, these strings are in the locale files.
   SetupInstallerUtilStrings();
 
   ChromeBrowserMainParts::PreMainMessageLoopStart();
   if (!parameters().ui_task) {
     // Make sure that we know how to handle exceptions from the message loop.
     InitializeWindowProcExceptions();
   }
+
+  ui::win::InitDeviceScaleFactor();

[sky, 2013/09/25 19:28:15]

Should this be earlier on? Maybe before toolkit is initialized, or at the time
the toolkit is initialized?

 }
 
 int ChromeBrowserMainPartsWin::PreCreateThreads() {
   int rv = ChromeBrowserMainParts::PreCreateThreads();
 
   // TODO(viettrungluu): why don't we run this earlier?
   if (!parsed_command_line().HasSwitch(switches::kNoErrorDialogs) &&
       base::win::GetVersion() < base::win::VERSION_XP) {
     chrome::ShowMessageBox(NULL,
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
@@ skipping 179 matching lines @@
   if (resource_id)
     return l10n_util::GetStringUTF16(resource_id);
   return string16();
 }
 
 // static
 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
   CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
   installer::SetTranslationDelegate(&delegate);
 }