summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 16:32:27 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 16:32:27 +0000
commit985702c9fa95e190d46b2093d542f42e70296ddd (patch)
tree2455216505ce539419cf8f07285bec6bb70c948c /chrome/browser/ui
parent786e4184139f32655e3dabe8fd44cd736e209209 (diff)
downloadchromium_src-985702c9fa95e190d46b2093d542f42e70296ddd.zip
chromium_src-985702c9fa95e190d46b2093d542f42e70296ddd.tar.gz
chromium_src-985702c9fa95e190d46b2093d542f42e70296ddd.tar.bz2
Fix up prerendering net-internals page and add some data:
Fix memory leak, fix CSS. Add whether or not prerendering is enabled, add time. BUG=none TEST=PrerenderHistoryTest.GetAsValue Review URL: http://codereview.chromium.org/7201009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/webui/net_internals_ui.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc
index 52fe458..9579dbe 100644
--- a/chrome/browser/ui/webui/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals_ui.cc
@@ -694,14 +694,14 @@ void NetInternalsMessageHandler::OnEnableHttpThrottling(const ListValue* list) {
void NetInternalsMessageHandler::OnGetPrerenderInfo(const ListValue* list) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- Value* value = NULL;
+ scoped_ptr<Value> value;
prerender::PrerenderManager* prerender_manager = prerender_manager_.get();
if (!prerender_manager) {
- value = new ListValue();
+ value.reset(new DictionaryValue());
} else {
- value = prerender_manager->GetAsValue();
+ value.reset(prerender_manager->GetAsValue());
}
- CallJavascriptFunction(L"g_browser.receivedPrerenderInfo", value);
+ CallJavascriptFunction(L"g_browser.receivedPrerenderInfo", value.get());
}