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

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

Issue 558403002: Remote Assistance on Chrome OS Part II - Native Messaging renaming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include cleanups 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
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 1445872616aabd10738b3d8fff564795ef62b065..1102e1799382e54a40719b965cf26cf34669e0de 100644
--- a/remoting/host/it2me/it2me_native_messaging_host.h
+++ b/remoting/host/it2me/it2me_native_messaging_host.h
@@ -8,9 +8,9 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "chrome/browser/extensions/api/messaging/native_messaging_channel.h"
#include "remoting/base/auto_thread_task_runner.h"
#include "remoting/host/it2me/it2me_host.h"
-#include "remoting/host/native_messaging/native_messaging_channel.h"
namespace base {
class DictionaryValue;
@@ -23,7 +23,7 @@ class It2MeNativeMessagingHost : public It2MeHost::Observer {
public:
It2MeNativeMessagingHost(
scoped_refptr<AutoThreadTaskRunner> task_runner,
- scoped_ptr<NativeMessagingChannel> channel,
+ scoped_ptr<extensions::NativeMessagingChannel> channel,
scoped_ptr<It2MeHostFactory> factory);
virtual ~It2MeNativeMessagingHost();
@@ -56,7 +56,7 @@ class It2MeNativeMessagingHost : public It2MeHost::Observer {
scoped_refptr<AutoThreadTaskRunner> task_runner() const;
- scoped_ptr<NativeMessagingChannel> channel_;
+ scoped_ptr<extensions::NativeMessagingChannel> channel_;
scoped_ptr<It2MeHostFactory> factory_;
scoped_ptr<ChromotingHostContext> host_context_;
scoped_refptr<It2MeHost> it2me_host_;

Powered by Google App Engine
This is Rietveld 408576698