Skip to content

GitLab

T
tangled
Commit 9e671397 authored by jam@chromium.org's avatar jam@chromium.org
Browse files
Options

Fix cros take2 

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138257 0039d316-1c4b-4281-b951-d872f2087c98
parent cad5055f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
ash/shell/content_client/shell_content_browser_client.cc
View file @ 9e671397
...@@ -98,7 +98,7 @@ bool ShellContentBrowserClient::ShouldSwapProcessesForNavigation( ...@@ -98,7 +98,7 @@ bool ShellContentBrowserClient::ShouldSwapProcessesForNavigation(
} }
bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect( bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect(
ResourceContext* resource_context, const GURL& current_url, content::ResourceContext* resource_context, const GURL& current_url,
const GURL& new_url) { const GURL& new_url) {
return false; return false;
} }
......
ash/shell/content_client/shell_content_browser_client.h
View file @ 9e671397
...@@ -56,7 +56,7 @@ class ShellContentBrowserClient : public content::ContentBrowserClient { ...@@ -56,7 +56,7 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
virtual bool ShouldSwapProcessesForNavigation(const GURL& current_url, virtual bool ShouldSwapProcessesForNavigation(const GURL& current_url,
const GURL& new_url) OVERRIDE; const GURL& new_url) OVERRIDE;
virtual bool ShouldSwapProcessesForRedirect( virtual bool ShouldSwapProcessesForRedirect(
ResourceContext* resource_context, content::ResourceContext* resource_context,
const GURL& current_url, const GURL& current_url,
const GURL& new_url) OVERRIDE; const GURL& new_url) OVERRIDE;
virtual std::string GetCanonicalEncodingNameByAliasName( virtual std::string GetCanonicalEncodingNameByAliasName(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment