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

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

Issue 7677004: Switch to using .pak files for locale data on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix autofill 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
Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index 37d3ef19351476fc56f65c6078dc6bc8c82b7f5f..47fbc2071a15793fcae16e16adb1a7db44099473 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -83,6 +83,10 @@ class UI_EXPORT ResourceBundle {
// 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 cleaning up this pointer.
cpu_(ooo_6.6-7.5) 2011/08/23 21:48:25 cleaning = deleting? sounds vague as is.
tony 2011/08/23 22:30:51 Switched to "deleting".
+ 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 @@ class UI_EXPORT ResourceBundle {
// 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_;

Powered by Google App Engine
This is Rietveld 408576698