summaryrefslogtreecommitdiffstats
path: root/app/resource_bundle.h
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 17:36:39 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 17:36:39 +0000
commit044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d (patch)
tree53becf6424efc668da228eebd3685ba2bdc53398 /app/resource_bundle.h
parentad4f19d37519b5b9aef6d3e1f59f9d5802d39437 (diff)
downloadchromium_src-044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d.zip
chromium_src-044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d.tar.gz
chromium_src-044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d.tar.bz2
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
Diffstat (limited to 'app/resource_bundle.h')
-rw-r--r--app/resource_bundle.h5
1 files changed, 3 insertions, 2 deletions
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();