| Index: chrome/browser/nacl_host/nacl_process_host.h
|
| ===================================================================
|
| --- chrome/browser/nacl_host/nacl_process_host.h (revision 134969)
|
| +++ chrome/browser/nacl_host/nacl_process_host.h (working copy)
|
| @@ -6,6 +6,8 @@
|
| #define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
|
| #pragma once
|
|
|
| +#include <string>
|
| +
|
| #include "build/build_config.h"
|
|
|
| #include "base/file_path.h"
|
| @@ -84,14 +86,6 @@
|
|
|
| void IrtReady();
|
|
|
| - // Sends the reply message to the renderer who is waiting for the plugin
|
| - // to load. Returns true on success.
|
| - bool ReplyToRenderer();
|
| -
|
| - // Sends the message to the NaCl process to load the plugin. Returns true
|
| - // on success.
|
| - bool StartNaClExecution();
|
| -
|
| // Called once all initialization is complete and the NaCl process is
|
| // ready to go. Returns true on success.
|
| bool SendStart();
|
| @@ -106,6 +100,8 @@
|
| void OnQueryKnownToValidate(const std::string& signature, bool* result);
|
| void OnSetKnownToValidate(const std::string& signature);
|
|
|
| + void OnPpapiChannelCreated(const IPC::ChannelHandle& channel_handle);
|
| +
|
| GURL manifest_url_;
|
|
|
| #if defined(OS_WIN)
|
| @@ -116,6 +112,7 @@
|
| // This field becomes true when the broker successfully launched
|
| // the NaCl loader.
|
| bool process_launched_by_broker_;
|
| +
|
| #elif defined(OS_LINUX)
|
| bool wait_for_nacl_gdb_;
|
| MessageLoopForIO::FileDescriptorWatcher nacl_gdb_watcher_;
|
|
|