Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: components/nacl/renderer/manifest_service_channel.h

Issue 418423002: Pepper: Stop using SRPC for irt_open_resource(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | components/nacl/renderer/manifest_service_channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | components/nacl/renderer/manifest_service_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698