Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1946)

Unified Diff: content/shell/browser/shell_content_browser_client.cc

Issue 2321543002: Merge CrossSiteResourceHandler and NavigationResourceThrottle (Closed)
Patch Set: Fixed test compilation error Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 46c8895cc8ac05b878468db81106682ee749f4e0..c697af0bfb1651f79b2a1aa49ce1a12a46f86ea5 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -264,7 +264,7 @@ net::NetLog* ShellContentBrowserClient::GetNetLog() {
}
bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect(
- ResourceContext* resource_context,
+ BrowserContext* browser_context,
const GURL& current_url,
const GURL& new_url) {
return g_swap_processes_for_redirect;

Powered by Google App Engine
This is Rietveld 408576698