summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 18:40:48 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 18:40:48 +0000
commit6215105307c39376a70a5e33314c275d89e1e74e (patch)
tree2d95253afc24cdbdd950a138409cbfb00332976b /content/shell
parente5eced540e39671176bad6c5d451f547100baed9 (diff)
downloadchromium_src-6215105307c39376a70a5e33314c275d89e1e74e.zip
chromium_src-6215105307c39376a70a5e33314c275d89e1e74e.tar.gz
chromium_src-6215105307c39376a70a5e33314c275d89e1e74e.tar.bz2
Hide WorkerProcessHost from chrome.
The code in chrome didn't need to know about all of WorkerProcessHost, which has many methods/getters especially counting WorkerInstance. Instead I added simple getters for the list of running workers, and the ability to terminate a worker. BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9317026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell_content_browser_client.cc8
-rw-r--r--content/shell/shell_content_browser_client.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index 98301f1..bffe450 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -163,19 +163,19 @@ bool ShellContentBrowserClient::AllowSaveLocalState(
}
bool ShellContentBrowserClient::AllowWorkerDatabase(
- int worker_route_id,
const GURL& url,
const string16& name,
const string16& display_name,
unsigned long estimated_size,
- WorkerProcessHost* worker_process_host) {
+ const content::ResourceContext& context,
+ const std::vector<std::pair<int, int> >& render_views) {
return true;
}
bool ShellContentBrowserClient::AllowWorkerFileSystem(
- int worker_route_id,
const GURL& url,
- WorkerProcessHost* worker_process_host) {
+ const content::ResourceContext& context,
+ const std::vector<std::pair<int, int> >& render_views) {
return true;
}
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 26ccebe..49fe5a1 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -74,16 +74,16 @@ class ShellContentBrowserClient : public ContentBrowserClient {
virtual bool AllowSaveLocalState(
const content::ResourceContext& context) OVERRIDE;
virtual bool AllowWorkerDatabase(
- int worker_route_id,
const GURL& url,
const string16& name,
const string16& display_name,
unsigned long estimated_size,
- WorkerProcessHost* worker_process_host) OVERRIDE;
+ const content::ResourceContext& context,
+ const std::vector<std::pair<int, int> >& render_views) OVERRIDE;
virtual bool AllowWorkerFileSystem(
- int worker_route_id,
const GURL& url,
- WorkerProcessHost* worker_process_host) OVERRIDE;
+ const content::ResourceContext& context,
+ const std::vector<std::pair<int, int> >& render_views) OVERRIDE;
virtual net::URLRequestContext* OverrideRequestContextForURL(
const GURL& url, const content::ResourceContext& context) OVERRIDE;
virtual QuotaPermissionContext* CreateQuotaPermissionContext() OVERRIDE;