diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
| commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
| tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/content/common/net | |
| parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/content/common/net')
| -rw-r--r-- | chromium/content/common/net/url_fetcher.cc | 10 | ||||
| -rw-r--r-- | chromium/content/common/net/url_request_user_data.cc | 4 | ||||
| -rw-r--r-- | chromium/content/common/net/url_request_user_data.h | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/chromium/content/common/net/url_fetcher.cc b/chromium/content/common/net/url_fetcher.cc index 2a46be94c85..0433c61160f 100644 --- a/chromium/content/common/net/url_fetcher.cc +++ b/chromium/content/common/net/url_fetcher.cc @@ -20,15 +20,15 @@ base::SupportsUserData::Data* CreateURLRequestUserData( } // namespace -void AssociateURLFetcherWithRenderView(net::URLFetcher* url_fetcher, - const GURL& first_party_for_cookies, - int render_process_id, - int render_view_id) { +void AssociateURLFetcherWithRenderFrame(net::URLFetcher* url_fetcher, + const GURL& first_party_for_cookies, + int render_process_id, + int render_frame_id) { url_fetcher->SetFirstPartyForCookies(first_party_for_cookies); url_fetcher->SetURLRequestUserData( URLRequestUserData::kUserDataKey, base::Bind(&CreateURLRequestUserData, - render_process_id, render_view_id)); + render_process_id, render_frame_id)); } } // namespace content diff --git a/chromium/content/common/net/url_request_user_data.cc b/chromium/content/common/net/url_request_user_data.cc index 3394c58c334..9a0ccb50001 100644 --- a/chromium/content/common/net/url_request_user_data.cc +++ b/chromium/content/common/net/url_request_user_data.cc @@ -7,9 +7,9 @@ namespace content { URLRequestUserData::URLRequestUserData(int render_process_id, - int render_view_id) + int render_frame_id) : render_process_id_(render_process_id), - render_view_id_(render_view_id) {} + render_frame_id_(render_frame_id) {} URLRequestUserData::~URLRequestUserData() {} diff --git a/chromium/content/common/net/url_request_user_data.h b/chromium/content/common/net/url_request_user_data.h index c3e464f72f9..f540becab87 100644 --- a/chromium/content/common/net/url_request_user_data.h +++ b/chromium/content/common/net/url_request_user_data.h @@ -13,17 +13,18 @@ namespace content { // with a given render view. class URLRequestUserData : public base::SupportsUserData::Data { public: - URLRequestUserData(int render_process_id, int render_view_id); + URLRequestUserData(int render_process_id, + int render_frame_id); virtual ~URLRequestUserData(); int render_process_id() const { return render_process_id_; } - int render_view_id() const { return render_view_id_; } + int render_frame_id() const { return render_frame_id_; } static const void* kUserDataKey; private: int render_process_id_; - int render_view_id_; + int render_frame_id_; }; } // namespace content |