diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 00:38:38 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 00:38:38 +0000 |
| commit | d4eafbf25ee2e43dbcee80ccb55a3e5c153dd189 (patch) | |
| tree | be8be064771dac45ef5f9d9c26bdead102e3d2b8 /chrome/browser/browser_main.cc | |
| parent | 2dea04cdfc632bfe29d7ffb436827ea2726ec092 (diff) | |
| download | chromium_src-d4eafbf25ee2e43dbcee80ccb55a3e5c153dd189.zip chromium_src-d4eafbf25ee2e43dbcee80ccb55a3e5c153dd189.tar.gz chromium_src-d4eafbf25ee2e43dbcee80ccb55a3e5c153dd189.tar.bz2 | |
Revert "Make the net resource interface use StringPiece instead of
std::string. This means we can point directly into the resource in the
binary, instead of copying. This makes sense for the TLD data, which doesn't
need to be copied around."
This reverts commit r5735.
TBR=deanm
Review URL: http://codereview.chromium.org/11298
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 5bc0e9b..91973ba 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -117,11 +117,11 @@ base::LazyInstance<LazyDirectoryListerCacher> lazy_dir_lister( base::LINKER_INITIALIZED); // This is called indirectly by the network layer to access resources. -StringPiece NetResourceProvider(int key) { +std::string NetResourceProvider(int key) { if (IDR_DIR_HEADER_HTML == key) - return StringPiece(lazy_dir_lister.Pointer()->html_data); + return lazy_dir_lister.Pointer()->html_data; - return ResourceBundle::GetSharedInstance().GetRawDataResource(key); + return ResourceBundle::GetSharedInstance().GetDataResource(key); } // Displays a warning message if the user is running chrome on windows 2000. |