| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index 9a87397c181618d01050d4adac1110543fcedffd..8c767321132a4e139bebbc9c7303906a1dda3410 100644
|
| --- a/content/app/content_main_runner.cc
|
| +++ b/content/app/content_main_runner.cc
|
| @@ -69,11 +69,12 @@
|
| #endif
|
|
|
| #if defined(OS_WIN)
|
| +#include <atlbase.h>
|
| +#include <atlapp.h>
|
| #include <malloc.h>
|
| #include <cstring>
|
|
|
| #include "base/strings/string_number_conversions.h"
|
| -#include "ui/base/win/atl_module.h"
|
| #include "ui/base/win/dpi_setup.h"
|
| #include "ui/gfx/win/dpi.h"
|
| #elif defined(OS_MACOSX)
|
| @@ -134,6 +135,8 @@
|
| #endif // !OS_IOS && !CHROME_MULTIPLE_DLL_BROWSER
|
|
|
| #if defined(OS_WIN)
|
| +
|
| +static CAppModule _Module;
|
|
|
| #endif // defined(OS_WIN)
|
|
|
| @@ -477,7 +480,7 @@
|
|
|
| #if defined(OS_WIN)
|
| RegisterInvalidParamHandler();
|
| - ui::win::CreateATLModuleIfNeeded();
|
| + _Module.Init(NULL, static_cast<HINSTANCE>(params.instance));
|
|
|
| sandbox_info_ = *params.sandbox_info;
|
| #else // !OS_WIN
|
| @@ -772,6 +775,8 @@
|
| #ifdef _CRTDBG_MAP_ALLOC
|
| _CrtDumpMemoryLeaks();
|
| #endif // _CRTDBG_MAP_ALLOC
|
| +
|
| + _Module.Term();
|
| #endif // OS_WIN
|
|
|
| #if defined(OS_MACOSX)
|
|
|