diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 17:52:50 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 17:52:50 +0000 |
| commit | a223028a2c2d8113c9dbad9681e65268a8229b9a (patch) | |
| tree | d373afb061ef288a94dd632a9fcbed9c7805141f /app/resource_bundle.h | |
| parent | 53ae7c4c5f08e73d66ef8b2303691d893f5d9e47 (diff) | |
| download | chromium_src-a223028a2c2d8113c9dbad9681e65268a8229b9a.zip chromium_src-a223028a2c2d8113c9dbad9681e65268a8229b9a.tar.gz chromium_src-a223028a2c2d8113c9dbad9681e65268a8229b9a.tar.bz2 | |
Revert 50257 - 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
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2811016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle.h')
| -rw-r--r-- | app/resource_bundle.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/resource_bundle.h b/app/resource_bundle.h index 1d328a3..3a3e617 100644 --- a/app/resource_bundle.h +++ b/app/resource_bundle.h @@ -159,9 +159,8 @@ class ResourceBundle { // Helper class for managing data packs. class LoadedDataPack { public: - explicit LoadedDataPack(const FilePath& path); - bool GetStringPiece(int resource_id, base::StringPiece* data) const; - RefCountedStaticMemory* GetStaticMemory(int resource_id) const; + LoadedDataPack(const FilePath& path); + bool GetStringPiece(int resource_id, base::StringPiece* data); private: void Load(); |