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

Unified Diff: chrome/app/chrome_main.cc

Issue 7328011: Introduce ui.dll / libui.so for the component build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
Index: chrome/app/chrome_main.cc
===================================================================
--- chrome/app/chrome_main.cc (revision 92566)
+++ 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

Powered by Google App Engine
This is Rietveld 408576698