| 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 cb199a4d7ae78d708c185d60d6bab02f8645948a..4a9f2de9b8d2102286b2146ed5af051cc6ffe1ee 100644
|
| --- a/content/shell/browser/shell_content_browser_client.cc
|
| +++ b/content/shell/browser/shell_content_browser_client.cc
|
| @@ -76,7 +76,7 @@ namespace content {
|
| namespace {
|
|
|
| ShellContentBrowserClient* g_browser_client;
|
| -bool g_swap_processes_for_redirect = false;
|
| +bool g_transfer_all_navigations = false;
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
|
| @@ -132,8 +132,8 @@ ShellContentBrowserClient* ShellContentBrowserClient::Get() {
|
| return g_browser_client;
|
| }
|
|
|
| -void ShellContentBrowserClient::SetSwapProcessesForRedirect(bool swap) {
|
| - g_swap_processes_for_redirect = swap;
|
| +void ShellContentBrowserClient::SetTransferAllNavigations(bool transfer) {
|
| + g_transfer_all_navigations = transfer;
|
| }
|
|
|
| ShellContentBrowserClient::ShellContentBrowserClient()
|
| @@ -155,6 +155,9 @@ BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
|
| bool ShellContentBrowserClient::DoesSiteRequireDedicatedProcess(
|
| BrowserContext* browser_context,
|
| const GURL& effective_site_url) {
|
| + if (g_transfer_all_navigations)
|
| + return true;
|
| +
|
| base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| DCHECK(command_line->HasSwitch(switches::kIsolateSitesForTesting));
|
| std::string pattern =
|
| @@ -317,13 +320,6 @@ net::NetLog* ShellContentBrowserClient::GetNetLog() {
|
| return shell_browser_main_parts_->net_log();
|
| }
|
|
|
| -bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect(
|
| - BrowserContext* browser_context,
|
| - const GURL& current_url,
|
| - const GURL& new_url) {
|
| - return g_swap_processes_for_redirect;
|
| -}
|
| -
|
| DevToolsManagerDelegate*
|
| ShellContentBrowserClient::GetDevToolsManagerDelegate() {
|
| return new ShellDevToolsManagerDelegate(browser_context());
|
|
|