Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 263453002: Revert r262011, which disabled support for resources in chrome.dll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698