diff options
| author | creis <creis@chromium.org> | 2016-01-14 09:37:57 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-14 17:38:48 +0000 |
| commit | c707227a27d0fd4f2f9f60dc2d339829b4e16549 (patch) | |
| tree | 6ee9d15f4f2db4ddf11d9294aaf1ac32015455f1 /extensions/browser/guest_view | |
| parent | 7194a6fa14a2fea0db9c20602b4a16913d7295f3 (diff) | |
| download | chromium_src-c707227a27d0fd4f2f9f60dc2d339829b4e16549.zip chromium_src-c707227a27d0fd4f2f9f60dc2d339829b4e16549.tar.gz chromium_src-c707227a27d0fd4f2f9f60dc2d339829b4e16549.tar.bz2 | |
Remove unused transferred_global_request_id parameter.
After removing OpenURLFromTab from navigation transfers in
https://crrev.com/365443, we no longer need to pass the request ID
through OpenURLParams or NavigateParams. (We still need the ID in
LoadURLParams for now.)
BUG=495161
TEST=No behavior change.
Review URL: https://codereview.chromium.org/1579363002
Cr-Commit-Position: refs/heads/master@{#369448}
Diffstat (limited to 'extensions/browser/guest_view')
| -rw-r--r-- | extensions/browser/guest_view/web_view/web_view_guest.cc | 14 | ||||
| -rw-r--r-- | extensions/browser/guest_view/web_view/web_view_guest.h | 1 |
2 files changed, 6 insertions, 9 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc index 452b275..1b146fa 100644 --- a/extensions/browser/guest_view/web_view/web_view_guest.cc +++ b/extensions/browser/guest_view/web_view/web_view_guest.cc @@ -1025,14 +1025,14 @@ void WebViewGuest::NavigateGuest(const std::string& src, // if the navigation is embedder-initiated. For browser-initiated navigations, // content scripts will be ready. if (force_navigation) { - SignalWhenReady(base::Bind( - &WebViewGuest::LoadURLWithParams, weak_ptr_factory_.GetWeakPtr(), url, - content::Referrer(), ui::PAGE_TRANSITION_AUTO_TOPLEVEL, - GlobalRequestID(), force_navigation)); + SignalWhenReady( + base::Bind(&WebViewGuest::LoadURLWithParams, + weak_ptr_factory_.GetWeakPtr(), url, content::Referrer(), + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, force_navigation)); return; } LoadURLWithParams(url, content::Referrer(), ui::PAGE_TRANSITION_AUTO_TOPLEVEL, - GlobalRequestID(), force_navigation); + force_navigation); } bool WebViewGuest::HandleKeyboardShortcuts( @@ -1304,7 +1304,6 @@ WebContents* WebViewGuest::OpenURLFromTab( // about:blank. if (params.disposition == CURRENT_TAB) { LoadURLWithParams(params.url, params.referrer, params.transition, - params.transferred_global_request_id, true /* force_navigation */); return web_contents(); } @@ -1362,7 +1361,6 @@ void WebViewGuest::LoadURLWithParams( const GURL& url, const content::Referrer& referrer, ui::PageTransition transition_type, - const GlobalRequestID& transferred_global_request_id, bool force_navigation) { if (!url.is_valid()) { LoadAbort(true /* is_top_level */, url, net::ERR_INVALID_URL, @@ -1400,7 +1398,7 @@ void WebViewGuest::LoadURLWithParams( load_url_params.referrer = referrer; load_url_params.transition_type = transition_type; load_url_params.extra_headers = std::string(); - load_url_params.transferred_global_request_id = transferred_global_request_id; + load_url_params.transferred_global_request_id = GlobalRequestID(); if (is_overriding_user_agent_) { load_url_params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE; diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h index 17012c6..fa01df8 100644 --- a/extensions/browser/guest_view/web_view/web_view_guest.h +++ b/extensions/browser/guest_view/web_view/web_view_guest.h @@ -298,7 +298,6 @@ class WebViewGuest : public guest_view::GuestView<WebViewGuest>, const GURL& url, const content::Referrer& referrer, ui::PageTransition transition_type, - const content::GlobalRequestID& transferred_global_request_id, bool force_navigation); void RequestNewWindowPermission( |