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

Unified Diff: remoting/host/it2me/it2me_native_messaging_host.h

Issue 1272833002: Pass error messages from native messaging to web-app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests. Created 5 years, 4 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: remoting/host/it2me/it2me_native_messaging_host.h
diff --git a/remoting/host/it2me/it2me_native_messaging_host.h b/remoting/host/it2me/it2me_native_messaging_host.h
index 02379baee3deb9c43aff3720044f17559c3a7529..f104f1d2ca9aeff7aeea8d9c55baf9d15a16712b 100644
--- a/remoting/host/it2me/it2me_native_messaging_host.h
+++ b/remoting/host/it2me/it2me_native_messaging_host.h
@@ -13,6 +13,10 @@
#include "remoting/host/chromoting_host_context.h"
#include "remoting/host/it2me/it2me_host.h"
+#if !defined(OS_CHROMEOS)
+#include "remoting/host/native_messaging/log_message_handler.h"
+#endif
+
namespace base {
class DictionaryValue;
class Value;
@@ -58,13 +62,19 @@ class It2MeNativeMessagingHost : public It2MeHost::Observer,
scoped_ptr<base::DictionaryValue> response);
void SendErrorAndExit(scoped_ptr<base::DictionaryValue> response,
const std::string& description) const;
- void SendMessageToClient(scoped_ptr<base::DictionaryValue> message) const;
+ void SendMessageToClient(scoped_ptr<base::Value> message) const;
Client* client_;
scoped_ptr<ChromotingHostContext> host_context_;
scoped_ptr<It2MeHostFactory> factory_;
scoped_refptr<It2MeHost> it2me_host_;
+#if !defined(OS_CHROMEOS)
+ // Don't install a log message handler on ChromeOS because we run in the
+ // browser process and don't want to intercept all its log messages.
+ scoped_ptr<LogMessageHandler> log_message_handler_;
+#endif
+
// Cached, read-only copies of |it2me_host_| session state.
It2MeHostState state_;
std::string access_code_;

Powered by Google App Engine
This is Rietveld 408576698