summaryrefslogtreecommitdiffstats
path: root/chrome/browser/nacl_host/nacl_process_host.h
diff options
context:
space:
mode:
authoryael.aharon@intel.com <yael.aharon@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 20:28:31 +0000
committeryael.aharon@intel.com <yael.aharon@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 20:28:31 +0000
commit3a0506cc06ab3d0d58e6a8280ed72ffcf6b8c12e (patch)
tree2a28742248d0af25f4dae1171304e26ed9f9ae4a /chrome/browser/nacl_host/nacl_process_host.h
parenta2e6740ab8135ca51f0817639a97d0a6138fb1d9 (diff)
downloadchromium_src-3a0506cc06ab3d0d58e6a8280ed72ffcf6b8c12e.zip
chromium_src-3a0506cc06ab3d0d58e6a8280ed72ffcf6b8c12e.tar.gz
chromium_src-3a0506cc06ab3d0d58e6a8280ed72ffcf6b8c12e.tar.bz2
Remove the dependency from nacl_process_host on extensions.
NaClProcessHost uses only the manifest url from the ExtensionInfoMap. Changed the Launch method to take the URL as parameter instead of the ExtensionInfoMap. This is part of an effort to componentize NaCl code. BUG=244791 Review URL: https://chromiumcodereview.appspot.com/18118007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host/nacl_process_host.h')
-rw-r--r--chrome/browser/nacl_host/nacl_process_host.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h
index 4f15e8a..4ac8829 100644
--- a/chrome/browser/nacl_host/nacl_process_host.h
+++ b/chrome/browser/nacl_host/nacl_process_host.h
@@ -23,7 +23,6 @@
class NaClHostMessageFilter;
class CommandLine;
-class ExtensionInfoMap;
namespace content {
class BrowserChildProcessHost;
@@ -65,7 +64,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
// message reply_msg.
void Launch(NaClHostMessageFilter* nacl_host_message_filter,
IPC::Message* reply_msg,
- scoped_refptr<ExtensionInfoMap> extension_info_map);
+ const base::FilePath& manifest_path);
virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
@@ -107,8 +106,6 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
// is enabled.
SocketDescriptor GetDebugStubSocketHandle();
#endif
- // Get path to manifest on local disk if possible.
- base::FilePath GetManifestPath();
bool LaunchSelLdr();
// BrowserChildProcessHostDelegate implementation:
@@ -181,9 +178,9 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
scoped_ptr<IPC::Message> attach_debug_exception_handler_reply_msg_;
#endif
- // Set of extensions for (NaCl) manifest auto-detection. The file path to
- // manifest is passed to nacl-gdb when it is used to debug the NaCl loader.
- scoped_refptr<ExtensionInfoMap> extension_info_map_;
+ // The file path to the manifest is passed to nacl-gdb when it is used to
+ // debug the NaCl loader.
+ base::FilePath manifest_path_;
// Socket pairs for the NaCl process and renderer.
scoped_ptr<NaClInternal> internal_;