diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-16 00:59:10 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-16 00:59:10 +0000 |
| commit | 4429700a526a501f1a8feb597fa23f9e861e9852 (patch) | |
| tree | 734f434874b7f07e85f26b0e85f1f6422b8a6218 /chrome/browser/dom_ui | |
| parent | d926bf73867d6a7c1ef777b7a555a4992f8bd62c (diff) | |
| download | chromium_src-4429700a526a501f1a8feb597fa23f9e861e9852.zip chromium_src-4429700a526a501f1a8feb597fa23f9e861e9852.tar.gz chromium_src-4429700a526a501f1a8feb597fa23f9e861e9852.tar.bz2 | |
Reland 47342.
Fixes the merge issue this time. Also fixes a TODO in another change that was blocked on this one.
Support SpdySession as a new NetLog source type. Start logging some more SPDY control frames.
Original code review: http://codereview.chromium.org/2102003/show
BUG=43237
Review URL: http://codereview.chromium.org/2114003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/net_internals_ui.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/net_internals_ui.cc b/chrome/browser/dom_ui/net_internals_ui.cc index c643af2..9b55d0e 100644 --- a/chrome/browser/dom_ui/net_internals_ui.cc +++ b/chrome/browser/dom_ui/net_internals_ui.cc @@ -523,6 +523,7 @@ void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady( net::NetLog::SOURCE_INIT_PROXY_RESOLVER); dict->SetInteger(L"CONNECT_JOB", net::NetLog::SOURCE_CONNECT_JOB); dict->SetInteger(L"SOCKET", net::NetLog::SOURCE_SOCKET); + dict->SetInteger(L"SPDY_SESSION", net::NetLog::SOURCE_SPDY_SESSION); CallJavascriptFunction(L"g_browser.receivedLogSourceTypeConstants", dict); } |