summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 23:07:31 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 23:07:31 +0000
commit2a5221b0a9d28aaf5b4c47f8d8f4384424c606cc (patch)
tree5b7980d1250993dfcf0e47f83797dbd2573e72df /content/shell
parent5efb2a82105d7060f5e4b132640da6ff35cb568b (diff)
downloadchromium_src-2a5221b0a9d28aaf5b4c47f8d8f4384424c606cc.zip
chromium_src-2a5221b0a9d28aaf5b4c47f8d8f4384424c606cc.tar.gz
chromium_src-2a5221b0a9d28aaf5b4c47f8d8f4384424c606cc.tar.bz2
Delegate decision what site instances can be rendered in what process to chrome
BUG=89642, 90443 TEST=nothing breaks Review URL: http://codereview.chromium.org/8033001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell_content_browser_client.cc6
-rw-r--r--content/shell/shell_content_browser_client.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index 9452759..a8eb258 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -76,6 +76,12 @@ bool ShellContentBrowserClient::IsURLSameAsAnySiteInstance(const GURL& url) {
return false;
}
+bool ShellContentBrowserClient::IsSuitableHost(
+ RenderProcessHost* process_host,
+ const GURL& site_url) {
+ return true;
+}
+
std::string ShellContentBrowserClient::GetCanonicalEncodingNameByAliasName(
const std::string& alias_name) {
return std::string();
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 6c2ce10..033897c 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -49,6 +49,8 @@ class ShellContentBrowserClient : public ContentBrowserClient
virtual bool ShouldUseProcessPerSite(BrowserContext* browser_context,
const GURL& effective_url) OVERRIDE;
virtual bool IsURLSameAsAnySiteInstance(const GURL& url) OVERRIDE;
+ virtual bool IsSuitableHost(RenderProcessHost* process_host,
+ const GURL& site_url) OVERRIDE;
virtual std::string GetCanonicalEncodingNameByAliasName(
const std::string& alias_name) OVERRIDE;
virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,