diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 06:45:22 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 06:45:22 +0000 |
| commit | 4f97280e6b2e0f2eab7fb3f504be1d85f5649a76 (patch) | |
| tree | 165fffb015d0cd17533104017217eac3f78c9564 /base/data_pack.h | |
| parent | 8c785eba63d0a6a4265d762e0be5daf1b769ff4c (diff) | |
| download | chromium_src-4f97280e6b2e0f2eab7fb3f504be1d85f5649a76.zip chromium_src-4f97280e6b2e0f2eab7fb3f504be1d85f5649a76.tar.gz chromium_src-4f97280e6b2e0f2eab7fb3f504be1d85f5649a76.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@50433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/data_pack.h')
| -rw-r--r-- | base/data_pack.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/data_pack.h b/base/data_pack.h index 8938491..f3f8481 100644 --- a/base/data_pack.h +++ b/base/data_pack.h @@ -35,12 +35,12 @@ class DataPack { // Get resource by id |resource_id|, filling in |data|. // The data is owned by the DataPack object and should not be modified. // Returns false if the resource id isn't found. - bool GetStringPiece(uint32 resource_id, StringPiece* data); + bool GetStringPiece(uint32 resource_id, StringPiece* data) const; // Like GetStringPiece(), but returns a reference to memory. This interface // is used for image data, while the StringPiece interface is usually used // for localization strings. - RefCountedStaticMemory* GetStaticMemory(uint32 resource_id); + RefCountedStaticMemory* GetStaticMemory(uint32 resource_id) const; // Writes a pack file containing |resources| to |path|. static bool WritePack(const FilePath& path, |