diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 00:29:50 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 00:29:50 +0000 |
| commit | 210ef1c6eacb7c953ff3051cf4548b2c72367138 (patch) | |
| tree | 8fe66b5d0fb3327a2293bc8dc9d267630c264a61 /base/data_pack.cc | |
| parent | 3bd386d1da67498cba15c64dbffe41bc76b4e199 (diff) | |
| download | chromium_src-210ef1c6eacb7c953ff3051cf4548b2c72367138.zip chromium_src-210ef1c6eacb7c953ff3051cf4548b2c72367138.tar.gz chromium_src-210ef1c6eacb7c953ff3051cf4548b2c72367138.tar.bz2 | |
Load net-internals from the newly created resources.pak file.
This patch also forces the loading of the optional DataPack for const correctness reasons
BUG=35793,42770
TEST=none
Review URL: http://codereview.chromium.org/2855003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/data_pack.cc')
| -rw-r--r-- | base/data_pack.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/data_pack.cc b/base/data_pack.cc index 4e5a569..06f2308 100644 --- a/base/data_pack.cc +++ b/base/data_pack.cc @@ -96,7 +96,7 @@ bool DataPack::Load(const FilePath& path) { return true; } -bool DataPack::GetStringPiece(uint32 resource_id, StringPiece* data) { +bool DataPack::GetStringPiece(uint32 resource_id, StringPiece* data) const { // It won't be hard to make this endian-agnostic, but it's not worth // bothering to do right now. #if defined(__BYTE_ORDER) @@ -119,7 +119,7 @@ bool DataPack::GetStringPiece(uint32 resource_id, StringPiece* data) { return true; } -RefCountedStaticMemory* DataPack::GetStaticMemory(uint32 resource_id) { +RefCountedStaticMemory* DataPack::GetStaticMemory(uint32 resource_id) const { base::StringPiece piece; if (!GetStringPiece(resource_id, &piece)) return NULL; |