diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 18:01:50 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 18:01:50 +0000 |
| commit | 0c95205965366d9acbc0cef488b5c197ddad2708 (patch) | |
| tree | 88705d02045b84a2c5ce9e6d731bd2d57c9c4a2d /net | |
| parent | fb2622f6816ed20ffd8a35994f7372b67613ba92 (diff) | |
| download | chromium_src-0c95205965366d9acbc0cef488b5c197ddad2708.zip chromium_src-0c95205965366d9acbc0cef488b5c197ddad2708.tar.gz chromium_src-0c95205965366d9acbc0cef488b5c197ddad2708.tar.bz2 | |
Add the URLRequest's priority to the net-log.
BUG=NONE
TEST=open about:net-internals, look at a request dump. there should be a "priority" field.
Review URL: http://codereview.chromium.org/2905007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/url_request/url_request.cc | 5 | ||||
| -rw-r--r-- | net/url_request/url_request_netlog_params.cc | 13 | ||||
| -rw-r--r-- | net/url_request/url_request_netlog_params.h | 8 |
3 files changed, 20 insertions, 6 deletions
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 3198e82..9f226c2 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 20010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -268,7 +268,8 @@ void URLRequest::StartJob(URLRequestJob* job) { net_log_.BeginEvent( net::NetLog::TYPE_URL_REQUEST_START_JOB, - new URLRequestStartEventParameters(url_, method_, load_flags_)); + new URLRequestStartEventParameters( + url_, method_, load_flags_, priority_)); job_ = job; job_->SetExtraRequestHeaders(extra_request_headers_); diff --git a/net/url_request/url_request_netlog_params.cc b/net/url_request/url_request_netlog_params.cc index d432e79..3693ee9 100644 --- a/net/url_request/url_request_netlog_params.cc +++ b/net/url_request/url_request_netlog_params.cc @@ -7,14 +7,21 @@ #include "base/values.h" URLRequestStartEventParameters::URLRequestStartEventParameters( - const GURL& url, const std::string& method, int load_flags) - : url_(url), method_(method), load_flags_(load_flags) {} + const GURL& url, + const std::string& method, + int load_flags, + net::RequestPriority priority) + : url_(url), + method_(method), + load_flags_(load_flags), + priority_(priority) { +} Value* URLRequestStartEventParameters::ToValue() const { DictionaryValue* dict = new DictionaryValue(); dict->SetString(L"url", url_.possibly_invalid_spec()); dict->SetString(L"method", method_); dict->SetInteger(L"load_flags", load_flags_); + dict->SetInteger(L"priority", static_cast<int>(priority_)); return dict; } - diff --git a/net/url_request/url_request_netlog_params.h b/net/url_request/url_request_netlog_params.h index 45c9791..5a28f54 100644 --- a/net/url_request/url_request_netlog_params.h +++ b/net/url_request/url_request_netlog_params.h @@ -7,15 +7,18 @@ #include <string> +#include "base/basictypes.h" #include "googleurl/src/gurl.h" #include "net/base/net_log.h" +#include "net/base/request_priority.h" // Holds the parameters to emit to the NetLog when starting a URLRequest. class URLRequestStartEventParameters : public net::NetLog::EventParameters { public: URLRequestStartEventParameters(const GURL& url, const std::string& method, - int load_flags); + int load_flags, + net::RequestPriority priority); const GURL& url() const { return url_; @@ -27,6 +30,9 @@ class URLRequestStartEventParameters : public net::NetLog::EventParameters { const GURL url_; const std::string method_; const int load_flags_; + const net::RequestPriority priority_; + + DISALLOW_COPY_AND_ASSIGN(URLRequestStartEventParameters); }; #endif // NET_URL_REQUEST_URL_REQUEST_NETLOG_PARAMS_H_ |