| Index: chrome/app/chrome_main.cc
|
| ===================================================================
|
| --- chrome/app/chrome_main.cc (revision 91577)
|
| +++ chrome/app/chrome_main.cc (working copy)
|
| @@ -49,6 +49,7 @@
|
|
|
| #if defined(OS_WIN)
|
| #include <algorithm>
|
| +#include <atlbase.h>
|
| #include <malloc.h>
|
| #include "base/string_util.h"
|
| #include "base/win/registry.h"
|
| @@ -773,6 +774,11 @@
|
| // done in all processes that work with these URLs (i.e. including renderers).
|
| chrome::RegisterChromeSchemes();
|
|
|
| +#if defined(OS_WIN)
|
| + // TODO(darin): Kill this once http://crbug.com/52609 is fixed.
|
| + ResourceBundle::SetResourcesDataDLL(_AtlBaseModule.GetResourceInstance());
|
| +#endif
|
| +
|
| if (SubprocessNeedsResourceBundle(process_type)) {
|
| // Initialize ResourceBundle which handles files loaded from external
|
| // sources. The language should have been passed in to us from the
|
|
|