From 044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Fri, 18 Jun 2010 17:36:39 +0000 Subject: Reland r50057. This is exactly the same except with two lines cherrypicked from tony's CL 2814009 that tell make about the net_internals_resources_map.{cc,h} files. Load net-internals from the newly created resources.pak file. This patch also forces the loading of the optional DataPack for const correctness reasons Original Review: http://codereview.chromium.org/2855003 BUG=35793,42770 TEST=none TBR=tony Review URL: http://codereview.chromium.org/2800014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50257 0039d316-1c4b-4281-b951-d872f2087c98 --- app/resource_bundle.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/resource_bundle.h') diff --git a/app/resource_bundle.h b/app/resource_bundle.h index 3a3e617..1d328a3 100644 --- a/app/resource_bundle.h +++ b/app/resource_bundle.h @@ -159,8 +159,9 @@ class ResourceBundle { // Helper class for managing data packs. class LoadedDataPack { public: - LoadedDataPack(const FilePath& path); - bool GetStringPiece(int resource_id, base::StringPiece* data); + explicit LoadedDataPack(const FilePath& path); + bool GetStringPiece(int resource_id, base::StringPiece* data) const; + RefCountedStaticMemory* GetStaticMemory(int resource_id) const; private: void Load(); -- cgit v1.1