| Index: chrome/app/chrome_main_delegate.cc
|
| diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
|
| index 8d7b29658f345dd5cef4b057dbd7ae714e586c55..f8f76ffc9c0b764686026527a244e245b1dd0ae5 100644
|
| --- a/chrome/app/chrome_main_delegate.cc
|
| +++ b/chrome/app/chrome_main_delegate.cc
|
| @@ -40,6 +40,7 @@
|
| #include "ui/base/ui_base_switches.h"
|
|
|
| #if defined(OS_WIN)
|
| +#include <atlbase.h>
|
| #include <malloc.h>
|
| #include <algorithm>
|
| #include "base/strings/string_util.h"
|
| @@ -679,6 +680,13 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
| logging::InitChromeLogging(command_line, file_state);
|
| #endif
|
|
|
| +#if defined(OS_WIN)
|
| + // TODO(zturner): Throbber icons are still stored in chrome.dll, this can be
|
| + // killed once those are merged into resources.pak. See
|
| + // GlassBrowserFrameView::InitThrobberIcons() and http://crbug.com/368327.
|
| + ui::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
|
|
|