remoting/host/setup/me2me_native_messaging_host.cc - Issue 558403002: Remote Assistance on Chrome OS Part II - Native Messaging renaming

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/host/setup/me2me_native_messaging_host.cc

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: 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

« remoting/host/it2me/it2me_native_messaging_host.h ('K') | « remoting/host/setup/me2me_native_messaging_host.h ('k') | remoting/host/setup/me2me_native_messaging_host_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/host/setup/me2me_native_messaging_host.cc

diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc

index 51b77ef574887820a5e37c5b60d58763940dfd51..08cd3a75e6dc29f0ebf7e24f1842086dd4102427 100644

--- a/remoting/host/setup/me2me_native_messaging_host.cc

+++ b/remoting/host/setup/me2me_native_messaging_host.cc

@@ -72,7 +72,7 @@ namespace remoting {

Me2MeNativeMessagingHost::Me2MeNativeMessagingHost(

bool needs_elevation,

intptr_t parent_window_handle,

- scoped_ptr<NativeMessagingChannel> channel,

+ scoped_ptr<extensions::NativeMessagingChannel> channel,

scoped_refptr<DaemonController> daemon_controller,

scoped_refptr<protocol::PairingRegistry> pairing_registry,

scoped_ptr<OAuthClient> oauth_client)

@@ -659,7 +659,7 @@ void Me2MeNativeMessagingHost::EnsureElevatedHostCreated() {

// Set up the native messaging channel to talk to the elevated host.

// Note that input for the elevate channel is output forthe elevated host.

- elevated_channel_.reset(new NativeMessagingChannel(

+ elevated_channel_.reset(new PipeMessagingChannel(

base::File(delegate_read_handle.Take()),

base::File(delegate_write_handle.Take())));