diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 15:13:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 15:13:50 +0000 |
| commit | 1751ffe9ed9b4ba53c550e012237a8cb2b4f659f (patch) | |
| tree | 2b87dd7d717fe90e93271ddd24f84e1cdda8399a /ash/shell | |
| parent | 10f6b86818871e59559d3687d24f21efdd40d928 (diff) | |
| download | chromium_src-1751ffe9ed9b4ba53c550e012237a8cb2b4f659f.zip chromium_src-1751ffe9ed9b4ba53c550e012237a8cb2b4f659f.tar.gz chromium_src-1751ffe9ed9b4ba53c550e012237a8cb2b4f659f.tar.bz2 | |
Fix cros
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/content_client/shell_content_browser_client.cc | 6 | ||||
| -rw-r--r-- | ash/shell/content_client/shell_content_browser_client.h | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ash/shell/content_client/shell_content_browser_client.cc b/ash/shell/content_client/shell_content_browser_client.cc index 557f4f4..fb8b7da 100644 --- a/ash/shell/content_client/shell_content_browser_client.cc +++ b/ash/shell/content_client/shell_content_browser_client.cc @@ -97,6 +97,12 @@ bool ShellContentBrowserClient::ShouldSwapProcessesForNavigation( return false; } +bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect( + ResourceContext* resource_context, const GURL& current_url, + const GURL& new_url) { + return false; +} + std::string ShellContentBrowserClient::GetCanonicalEncodingNameByAliasName( const std::string& alias_name) { return std::string(); diff --git a/ash/shell/content_client/shell_content_browser_client.h b/ash/shell/content_client/shell_content_browser_client.h index c7dd308..fbfe99e 100644 --- a/ash/shell/content_client/shell_content_browser_client.h +++ b/ash/shell/content_client/shell_content_browser_client.h @@ -55,7 +55,10 @@ class ShellContentBrowserClient : public content::ContentBrowserClient { content::SiteInstance* site_instance) OVERRIDE; virtual bool ShouldSwapProcessesForNavigation(const GURL& current_url, const GURL& new_url) OVERRIDE; - + virtual bool ShouldSwapProcessesForRedirect( + ResourceContext* resource_context, + const GURL& current_url, + const GURL& new_url) OVERRIDE; virtual std::string GetCanonicalEncodingNameByAliasName( const std::string& alias_name) OVERRIDE; virtual void AppendExtraCommandLineSwitches(CommandLine* command_line, |