remoting/host/session_manager.h - Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message.

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/session_manager.h

Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Fix merge conflicts Created 10 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:

Index: remoting/host/session_manager.h

diff --git a/remoting/host/session_manager.h b/remoting/host/session_manager.h

index 83c437a973ccbbd8e1547a1e1adfeaae3ea60ad0..c39ca3b5850219b8776cd2afb291cb4ac4709075 100644

--- a/remoting/host/session_manager.h

+++ b/remoting/host/session_manager.h

@@ -131,7 +131,7 @@ class SessionManager : public base::RefCountedThreadSafe<SessionManager> {

void DoRateControl();

// DoSendUpdate takes ownership of header and is responsible for deleting it.

- void DoSendUpdate(HostMessage* message,

+ void DoSendUpdate(ChromotingHostMessage* message,

Encoder::EncodingState state);

void DoSendInit(scoped_refptr<ClientConnection> client,

int width, int height);

@@ -146,7 +146,7 @@ class SessionManager : public base::RefCountedThreadSafe<SessionManager> {

// EncodeDataAvailableTask takes ownership of header and is responsible for

// deleting it.

- void EncodeDataAvailableTask(HostMessage* message,

+ void EncodeDataAvailableTask(ChromotingHostMessage* message,

Encoder::EncodingState state);

// Message loops used by this class.

« no previous file with comments | « remoting/host/event_executor_win.cc ('k') | remoting/host/session_manager.cc » ('j') | no next file with comments »