diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 00:45:34 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 00:45:34 +0000 |
| commit | 1408c8297755306f0d688956fbc2f93fd6d692ac (patch) | |
| tree | 50997a29208c8505961d7fd8634b7abd2a632c5c /app/resource_bundle.h | |
| parent | c01c61d5d1b86b72e4e1ee4a96870196a8057644 (diff) | |
| download | chromium_src-1408c8297755306f0d688956fbc2f93fd6d692ac.zip chromium_src-1408c8297755306f0d688956fbc2f93fd6d692ac.tar.gz chromium_src-1408c8297755306f0d688956fbc2f93fd6d692ac.tar.bz2 | |
Revert 50057 - 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
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2852011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50059 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(); |