diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 20:46:52 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 20:46:52 +0000 |
| commit | 042ba8592ac73507fda0135d977b63347b77b873 (patch) | |
| tree | 1472630f6960ec5ee2214bd11f33939f7282a70a /content/browser/ppapi_plugin_process_host.h | |
| parent | 7e1dc3d25fb9211ae4baf7577ef72afcad78f2e1 (diff) | |
| download | chromium_src-042ba8592ac73507fda0135d977b63347b77b873.zip chromium_src-042ba8592ac73507fda0135d977b63347b77b873.tar.gz chromium_src-042ba8592ac73507fda0135d977b63347b77b873.tar.bz2 | |
Revert 140093 - Open pepper files directly in browser.
This CL merges in the changes for the per-profile plugin process from the
previously retired CL.
Review URL: https://chromiumcodereview.appspot.com/10387195
TBR=tsepez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10477006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ppapi_plugin_process_host.h')
| -rw-r--r-- | content/browser/ppapi_plugin_process_host.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/content/browser/ppapi_plugin_process_host.h b/content/browser/ppapi_plugin_process_host.h index f5954f5..71314b1 100644 --- a/content/browser/ppapi_plugin_process_host.h +++ b/content/browser/ppapi_plugin_process_host.h @@ -6,14 +6,12 @@ #define CONTENT_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_ #pragma once -#include <string> #include <queue> #include "base/basictypes.h" #include "base/file_path.h" -#include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "content/browser/renderer_host/pepper_file_message_filter.h" +#include "base/memory/ref_counted.h" #include "content/browser/renderer_host/pepper_message_filter.h" #include "content/public/browser/browser_child_process_host_delegate.h" #include "content/public/browser/browser_child_process_host_iterator.h" @@ -81,8 +79,7 @@ class PpapiPluginProcessHost : public content::BrowserChildProcessHostDelegate, const FilePath& plugin_path() const { return plugin_path_; } const FilePath& profile_data_directory() const { - return profile_data_directory_; - } + return profile_data_directory_; } // The client pointer must remain valid until its callback is issued. @@ -91,8 +88,7 @@ class PpapiPluginProcessHost : public content::BrowserChildProcessHostDelegate, // Constructors for plugin and broker process hosts, respectively. // You must call Init before doing anything else. - PpapiPluginProcessHost(const std::string& plugin_name, - const FilePath& profile_data_directory, + PpapiPluginProcessHost(const FilePath& profile_data_directory, net::HostResolver* host_resolver); PpapiPluginProcessHost(); @@ -116,9 +112,6 @@ class PpapiPluginProcessHost : public content::BrowserChildProcessHostDelegate, // Handles most requests from the plugin. May be NULL. scoped_refptr<PepperMessageFilter> filter_; - // Handles filesystem requests from flash plugins. May be NULL. - scoped_refptr<PepperFileMessageFilter> file_filter_; - // Observes network changes. May be NULL. scoped_ptr<PluginNetworkObserver> network_observer_; |