Index: components/nacl/renderer/manifest_service_channel.h |
diff --git a/components/nacl/renderer/manifest_service_channel.h b/components/nacl/renderer/manifest_service_channel.h |
index a1af5301bf226386799817bede9bf101d1f70e05..71a1034b86e1b0becb3868ca1075470e6737cbe7 100644 |
--- a/components/nacl/renderer/manifest_service_channel.h |
+++ b/components/nacl/renderer/manifest_service_channel.h |
@@ -28,7 +28,8 @@ namespace nacl { |
class ManifestServiceChannel : public IPC::Listener { |
public: |
- typedef base::Callback<void(base::File)> OpenResourceCallback; |
+ typedef base::Callback<void(base::File, uint64_t, uint64_t)> |
+ OpenResourceCallback; |
class Delegate { |
public: |
@@ -61,14 +62,16 @@ class ManifestServiceChannel : public IPC::Listener { |
private: |
void OnStartupInitializationComplete(); |
void OnOpenResource(const std::string& key, IPC::Message* reply); |
-#if !defined(OS_WIN) |
- void DidOpenResource(IPC::Message* reply, base::File file); |
-#endif |
- |
+ void DidOpenResource(IPC::Message* reply, |
+ base::File file, |
+ uint64_t token_lo, |
+ uint64_t token_hi); |
base::Callback<void(int32_t)> connected_callback_; |
scoped_ptr<Delegate> delegate_; |
scoped_ptr<IPC::SyncChannel> channel_; |
+ base::ProcessId peer_pid_; |
+ |
// Note: This should remain the last member so it'll be destroyed and |
// invalidate the weak pointers before any other members are destroyed. |
base::WeakPtrFactory<ManifestServiceChannel> weak_ptr_factory_; |