diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 15:42:54 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 15:42:54 +0000 |
| commit | 9e671397fa8e53966dec0e83636bdf4877e4c712 (patch) | |
| tree | 6d81c2275a485b73fb758343b37ec80534e86992 /ash/shell | |
| parent | cad5055f1cb8ffaba109c7e2fac6f88d8dfd83d6 (diff) | |
| download | chromium_src-9e671397fa8e53966dec0e83636bdf4877e4c712.zip chromium_src-9e671397fa8e53966dec0e83636bdf4877e4c712.tar.gz chromium_src-9e671397fa8e53966dec0e83636bdf4877e4c712.tar.bz2 | |
Fix cros take2
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/content_client/shell_content_browser_client.cc | 2 | ||||
| -rw-r--r-- | ash/shell/content_client/shell_content_browser_client.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell/content_client/shell_content_browser_client.cc b/ash/shell/content_client/shell_content_browser_client.cc index fb8b7da..36941f8 100644 --- a/ash/shell/content_client/shell_content_browser_client.cc +++ b/ash/shell/content_client/shell_content_browser_client.cc @@ -98,7 +98,7 @@ bool ShellContentBrowserClient::ShouldSwapProcessesForNavigation( } bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect( - ResourceContext* resource_context, const GURL& current_url, + content::ResourceContext* resource_context, const GURL& current_url, const GURL& new_url) { return false; } diff --git a/ash/shell/content_client/shell_content_browser_client.h b/ash/shell/content_client/shell_content_browser_client.h index fbfe99e..ebbc2be 100644 --- a/ash/shell/content_client/shell_content_browser_client.h +++ b/ash/shell/content_client/shell_content_browser_client.h @@ -56,7 +56,7 @@ class ShellContentBrowserClient : public content::ContentBrowserClient { virtual bool ShouldSwapProcessesForNavigation(const GURL& current_url, const GURL& new_url) OVERRIDE; virtual bool ShouldSwapProcessesForRedirect( - ResourceContext* resource_context, + content::ResourceContext* resource_context, const GURL& current_url, const GURL& new_url) OVERRIDE; virtual std::string GetCanonicalEncodingNameByAliasName( |