Commit ea853911 authored by zturner@chromium.org's avatar zturner@chromium.org

Revert r262011, which disabled support for resources in chrome.dll.

This is necessary until the throbber icons can be moved into
resources.pak.

BUG=368327,52609
R=cpu@chromium.org

Review URL: https://codereview.chromium.org/263453002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266954 0039d316-1c4b-4281-b951-d872f2087c98
parent e5611d12
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_switches.h"
#if defined(OS_WIN) #if defined(OS_WIN)
#include <atlbase.h>
#include <malloc.h> #include <malloc.h>
#include <algorithm> #include <algorithm>
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
...@@ -679,6 +680,13 @@ void ChromeMainDelegate::PreSandboxStartup() { ...@@ -679,6 +680,13 @@ void ChromeMainDelegate::PreSandboxStartup() {
logging::InitChromeLogging(command_line, file_state); logging::InitChromeLogging(command_line, file_state);
#endif #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)) { if (SubprocessNeedsResourceBundle(process_type)) {
// Initialize ResourceBundle which handles files loaded from external // Initialize ResourceBundle which handles files loaded from external
// sources. The language should have been passed in to us from the // sources. The language should have been passed in to us from the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment