summaryrefslogtreecommitdiffstats
path: root/content/browser/plugin_process_host.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 21:43:17 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 21:43:17 +0000
commitb39e7a88bd6d2cbe16754ebca13af1a0ca837fb1 (patch)
treebbb01564db7c3a79032fdb8dec716c7496c9c9e2 /content/browser/plugin_process_host.h
parent52da2379abbfa18dbc333bb275b7377ad8dce551 (diff)
downloadchromium_src-b39e7a88bd6d2cbe16754ebca13af1a0ca837fb1.zip
chromium_src-b39e7a88bd6d2cbe16754ebca13af1a0ca837fb1.tar.gz
chromium_src-b39e7a88bd6d2cbe16754ebca13af1a0ca837fb1.tar.bz2
Revert 117078 - Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a few benefits:
-avoid having each embedder know when to create/destruct these objects, as well as contained objects (i.e. those related to downloads) -avoid having to tell embedders about specifics of BrowserThread startup/shutdown -move ResourceDispatcherHost's getter to content where it belongs Some code (extensions+promos) used the fact that RDH is NULL in unittests as a signal to not use the utility process. I've switches those unittests to set a flag on the objects instead. I've taken out the DnsParallelism field trial (not used anymore, confirmed with jar) as it was the only thing that caused MetricsService to depend on IOThread initialization, which also depended on MetricsService (through FieldTrials). This two-sided dependency always annoyed me and made the code hard to restructure. BUG=98716 Review URL: http://codereview.chromium.org/9150016 TBR=jam@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_process_host.h')
-rw-r--r--content/browser/plugin_process_host.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/plugin_process_host.h b/content/browser/plugin_process_host.h
index 2fabe64..6ce5f08 100644
--- a/content/browser/plugin_process_host.h
+++ b/content/browser/plugin_process_host.h
@@ -67,7 +67,7 @@ class CONTENT_EXPORT PluginProcessHost : public BrowserChildProcessHost {
// Initialize the new plugin process, returning true on success. This must
// be called before the object can be used.
- bool Init(const webkit::WebPluginInfo& info);
+ bool Init(const webkit::WebPluginInfo& info, const std::string& locale);
// Force the plugin process to shutdown (cleanly).
void ForceShutdown();