| Index: chrome/browser/chrome_content_browser_client.cc
|
| ===================================================================
|
| --- chrome/browser/chrome_content_browser_client.cc (revision 138143)
|
| +++ chrome/browser/chrome_content_browser_client.cc (working copy)
|
| @@ -72,6 +72,7 @@
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/extensions/extension.h"
|
| +#include "chrome/common/extensions/extension_process_policy.h"
|
| #include "chrome/common/extensions/extension_set.h"
|
| #include "chrome/common/logging_chrome.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -682,6 +683,15 @@
|
| return false;
|
| }
|
|
|
| +bool ChromeContentBrowserClient::ShouldSwapProcessesForRedirect(
|
| + content::ResourceContext* resource_context, const GURL& current_url,
|
| + const GURL& new_url) {
|
| + ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
|
| + return extensions::CrossesExtensionProcessBoundary(
|
| + io_data->GetExtensionInfoMap()->extensions(),
|
| + ExtensionURLInfo(current_url), ExtensionURLInfo(new_url));
|
| +}
|
| +
|
| std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName(
|
| const std::string& alias_name) {
|
| return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name);
|
|
|