diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 22:12:39 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 22:12:39 +0000 |
| commit | 26c2b23471dafa0db5254e28907e3741b98ac3ed (patch) | |
| tree | 805b9575d20911ef40791e48910700584afdd847 /base | |
| parent | 7b1bf816970d76ef2a062f3bd1e235e7e584746b (diff) | |
| download | chromium_src-26c2b23471dafa0db5254e28907e3741b98ac3ed.zip chromium_src-26c2b23471dafa0db5254e28907e3741b98ac3ed.tar.gz chromium_src-26c2b23471dafa0db5254e28907e3741b98ac3ed.tar.bz2 | |
Speculatively revert 50374 (miniinstaller breakage) - Load netinternals 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
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2799022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/data_pack.cc | 4 | ||||
| -rw-r--r-- | base/data_pack.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/base/data_pack.cc b/base/data_pack.cc index 06f2308..4e5a569 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) const { +bool DataPack::GetStringPiece(uint32 resource_id, StringPiece* data) { // 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) const { return true; } -RefCountedStaticMemory* DataPack::GetStaticMemory(uint32 resource_id) const { +RefCountedStaticMemory* DataPack::GetStaticMemory(uint32 resource_id) { base::StringPiece piece; if (!GetStringPiece(resource_id, &piece)) return NULL; diff --git a/base/data_pack.h b/base/data_pack.h index f3f8481..8938491 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) const; + bool GetStringPiece(uint32 resource_id, StringPiece* data); // 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) const; + RefCountedStaticMemory* GetStaticMemory(uint32 resource_id); // Writes a pack file containing |resources| to |path|. static bool WritePack(const FilePath& path, |