diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 20:07:17 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 20:07:17 +0000 |
| commit | af19338e9e281cb36b94c198a95d1e9a760e767b (patch) | |
| tree | 3d74d34c43a63208fe47c607db8c618bf36462cf /app/resource_bundle.h | |
| parent | 109fc45253e5601dce3fdc35fea2ac1bed08a9b0 (diff) | |
| download | chromium_src-af19338e9e281cb36b94c198a95d1e9a760e767b.zip chromium_src-af19338e9e281cb36b94c198a95d1e9a760e767b.tar.gz chromium_src-af19338e9e281cb36b94c198a95d1e9a760e767b.tar.bz2 | |
Load net-internals resources from resources.pak.
This is the same as r50257 with 2 fixes:
1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will
work for things tests.
2) Add back the check in chrome_paths.cc to see if we're in a
mac bundle or not.
BUG=35793,42770
TEST=none
Review URL: http://codereview.chromium.org/2865010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle.h')
| -rw-r--r-- | app/resource_bundle.h | 5 |
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(); |