remoting/host/host_main.cc - Issue 103053006: Renaming NativeMessagingHost to Me2MeNativeMessagingHost.

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/host_main.cc

Issue 103053006: Renaming NativeMessagingHost to Me2MeNativeMessagingHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegage

Patch Set: Resolving merge conflict. Created 7 years 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/host_main.cc

diff --git a/remoting/host/host_main.cc b/remoting/host/host_main.cc

index 75ce6fdfba8a25be507eb9794fbb19812efe3ffe..7c9fb16f27718928b6f3b82a0d7c02a19e52198c 100644

--- a/remoting/host/host_main.cc

+++ b/remoting/host/host_main.cc

@@ -146,7 +146,7 @@ MainRoutineFn SelectMainRoutine(const std::string& process_type) {

} else if (process_type == kProcessTypeRdpDesktopSession) {

main_routine = &RdpDesktopSessionMain;

} else if (process_type == kProcessTypeNativeMessagingHost) {

- main_routine = &NativeMessagingHostMain;

+ main_routine = &Me2MeNativeMessagingHostMain;

#endif // defined(OS_WIN)

}

« no previous file with comments | « PRESUBMIT.py ('k') | remoting/host/it2me/it2me_native_messaging_host_unittest.cc » ('j') | no next file with comments »