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

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

Issue 424893003: Pepper: Move NaCl fatal logging to Chrome IPC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix for dmichael Created 6 years, 5 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
Index: components/nacl/renderer/trusted_plugin_channel.h
diff --git a/components/nacl/renderer/trusted_plugin_channel.h b/components/nacl/renderer/trusted_plugin_channel.h
index c0b4031eb2331e7ff73140a50b675edcda4a1b0b..8f1e931c16fb499b2fefad0fdbdb92b885eeb5ac 100644
--- a/components/nacl/renderer/trusted_plugin_channel.h
+++ b/components/nacl/renderer/trusted_plugin_channel.h
@@ -5,9 +5,11 @@
#ifndef COMPONENTS_NACL_RENDERER_TRUSTED_PLUGIN_CHANNEL_H_
#define COMPONENTS_NACL_RENDERER_TRUSTED_PLUGIN_CHANNEL_H_
+#include <string>
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
#include "ipc/ipc_listener.h"
+#include "ppapi/c/pp_instance.h"
namespace base {
class WaitableEvent;
@@ -23,7 +25,8 @@ namespace nacl {
class TrustedPluginChannel : public IPC::Listener {
public:
- explicit TrustedPluginChannel(const IPC::ChannelHandle& handle);
+ explicit TrustedPluginChannel(PP_Instance instance,
+ const IPC::ChannelHandle& handle);
virtual ~TrustedPluginChannel();
bool Send(IPC::Message* message);
@@ -31,7 +34,10 @@ class TrustedPluginChannel : public IPC::Listener {
// Listener implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ void OnFatalLogReceived(const std::string& log);
+
private:
+ PP_Instance instance_;
scoped_ptr<IPC::ChannelProxy> channel_proxy_;
DISALLOW_COPY_AND_ASSIGN(TrustedPluginChannel);

Powered by Google App Engine
This is Rietveld 408576698