diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 09:51:40 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 09:51:40 +0000 |
| commit | 289f5a7870a3f1e5ed7b465556125515a6e474b0 (patch) | |
| tree | 6c2569a80bd165d905f7c84cc04798dda9fb0f60 /chrome/browser/ui/webui/task_manager_ui.cc | |
| parent | dc20613ba3e16cf90dc862cdd27c989a1388a6b0 (diff) | |
| download | chromium_src-289f5a7870a3f1e5ed7b465556125515a6e474b0.zip chromium_src-289f5a7870a3f1e5ed7b465556125515a6e474b0.tar.gz chromium_src-289f5a7870a3f1e5ed7b465556125515a6e474b0.tar.bz2 | |
Revert 93365 - it broke on Chrome OS
Added RefCountedString, as this is what many RefCountedMemory users seem to want
Made data member of RefCountedBytes private, as per style guide
Changed base64 APIs to accept StringPiece, as it's sometimes better and never worse than string.
BUG=None
TEST=All existing tests pass. Extended ref_counted_memory_unittests
Review URL: http://codereview.chromium.org/7397021
TBR=joth@chromium.org
Review URL: http://codereview.chromium.org/7471033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/task_manager_ui.cc')
| -rw-r--r-- | chrome/browser/ui/webui/task_manager_ui.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/task_manager_ui.cc b/chrome/browser/ui/webui/task_manager_ui.cc index ae33f06..5a4a316 100644 --- a/chrome/browser/ui/webui/task_manager_ui.cc +++ b/chrome/browser/ui/webui/task_manager_ui.cc @@ -85,10 +85,14 @@ void TaskManagerUIHTMLSource::StartDataRequest(const std::string& path, static const base::StringPiece task_manager_html( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_TASK_MANAGER_HTML)); - std::string full_html = jstemplate_builder::GetI18nTemplateHtml( + const std::string full_html = jstemplate_builder::GetI18nTemplateHtml( task_manager_html, &localized_strings); - SendResponse(request_id, base::RefCountedString::TakeString(&full_html)); + scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes); + html_bytes->data.resize(full_html.size()); + std::copy(full_html.begin(), full_html.end(), html_bytes->data.begin()); + + SendResponse(request_id, html_bytes); } } // namespace |