Index: chrome/browser/nacl_host/nacl_process_host.h |
diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h |
index 59f4f50730e615aaf54f2bccc34ebef26c6bdb22..ce734914e3bccbf1448df404478d161693ebc294 100644 |
--- a/chrome/browser/nacl_host/nacl_process_host.h |
+++ b/chrome/browser/nacl_host/nacl_process_host.h |
@@ -28,6 +28,9 @@ class NaClProcessHost : public BrowserChildProcessHost { |
explicit NaClProcessHost(const std::wstring& url); |
virtual ~NaClProcessHost(); |
+ // Do any minimal work that must be done at browser startup. |
+ static void EarlyStartup(); |
+ |
// Initialize the new NaCl process, returning true on success. |
bool Launch(ChromeRenderMessageFilter* chrome_render_message_filter, |
int socket_count, |
@@ -50,15 +53,10 @@ class NaClProcessHost : public BrowserChildProcessHost { |
bool LaunchSelLdr(); |
- // Get the architecture-specific filename of NaCl's integrated |
- // runtime (IRT) library, relative to the plugins directory. |
- FilePath::StringType GetIrtLibraryFilename(); |
- |
virtual void OnProcessLaunched(); |
- void OpenIrtFileDone(base::PlatformFileError error_code, |
- base::PassPlatformFile file, |
- bool created); |
+ void IrtReady(); |
+ void SendStart(base::PlatformFile irt_file); |
virtual bool CanShutdown(); |
@@ -73,9 +71,6 @@ class NaClProcessHost : public BrowserChildProcessHost { |
// Socket pairs for the NaCl process and renderer. |
scoped_ptr<NaClInternal> internal_; |
- // Windows platform flag |
- bool running_on_wow64_; |
- |
base::WeakPtrFactory<NaClProcessHost> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); |