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

Unified Diff: ui/base/resource/resource_bundle.h

Issue 7759001: Revert 98426 - Revert 98103 - Switch to using .pak files for locale data on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | « ui/base/l10n/l10n_util_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.h
===================================================================
--- ui/base/resource/resource_bundle.h (revision 98426)
+++ ui/base/resource/resource_bundle.h (working copy)
@@ -83,6 +83,10 @@
// Initialize the ResourceBundle using given data pack path for testing.
static void InitSharedInstanceForTest(const FilePath& path);
+ // Load a .pak file. Returns NULL if we fail to load |path|. The caller
+ // is responsible for deleting up this pointer.
+ static DataPack* LoadResourcesDataPak(const FilePath& path);
+
// Changes the locale for an already-initialized ResourceBundle. Future
// calls to get strings will return the strings for this new locale. This
// has no effect on existing or future image resources. This has no effect
@@ -271,7 +275,9 @@
// Handles for data sources.
DataHandle resources_data_;
DataHandle large_icon_resources_data_;
- DataHandle locale_resources_data_;
+#if !defined(NACL_WIN64)
+ scoped_ptr<DataPack> locale_resources_data_;
+#endif
// References to extra data packs loaded via AddDataPackToSharedInstance.
std::vector<LoadedDataPack*> data_packs_;
« no previous file with comments | « ui/base/l10n/l10n_util_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698