remoting/remoting.gyp - Issue 4313001: Rename classes for Chromoting:

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/remoting.gyp

Issue 4313001: Rename classes for Chromoting: (Closed) Base URL: http://git.chromium.org/git/chromium.git

Patch Set: Resolve merge conflicts Created 10 years, 1 month 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/remoting.gyp

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp

index 80d8d5d3eba7011b082c0b4cb675ee344eca73e9..f4e7079757258cc6687f810c87e11d0c43bbe188 100644

--- a/remoting/remoting.gyp

+++ b/remoting/remoting.gyp

@@ -365,8 +365,6 @@

'protocol/buffered_socket_writer.h',

'protocol/chromotocol_config.cc',

'protocol/chromotocol_config.h',

- 'protocol/chromotocol_connection.h',

- 'protocol/chromotocol_server.h',

'protocol/host_control_message_handler.h',

'protocol/host_event_message_handler.h',

'protocol/host_message_dispatcher.cc',

@@ -375,14 +373,14 @@

'protocol/message_decoder.h',

'protocol/message_reader.cc',

'protocol/message_reader.h',

- 'protocol/jingle_chromotocol_connection.cc',

- 'protocol/jingle_chromotocol_connection.h',

- 'protocol/jingle_chromotocol_server.cc',

- 'protocol/jingle_chromotocol_server.h',

'protocol/protobuf_video_reader.cc',

'protocol/protobuf_video_reader.h',

'protocol/protobuf_video_writer.cc',

'protocol/protobuf_video_writer.h',

+ 'protocol/jingle_session.cc',

+ 'protocol/jingle_session.h',

+ 'protocol/jingle_session_manager.cc',

+ 'protocol/jingle_session_manager.h',

'protocol/rtp_reader.cc',

'protocol/rtp_reader.h',

'protocol/rtp_utils.cc',

@@ -393,6 +391,8 @@

'protocol/rtp_video_writer.h',

'protocol/rtp_writer.cc',

'protocol/rtp_writer.h',

+ 'protocol/session.h',

+ 'protocol/session_manager.h',

'protocol/socket_reader_base.cc',

'protocol/socket_reader_base.h',

'protocol/stream_writer.cc',

@@ -470,10 +470,10 @@

'jingle_glue/iq_request_unittest.cc',

'jingle_glue/mock_objects.h',

'jingle_glue/stream_socket_adapter_unittest.cc',

- 'protocol/jingle_chromotocol_connection_unittest.cc',

+ 'protocol/jingle_session_unittest.cc',

'protocol/message_decoder_unittest.cc',

- 'protocol/fake_connection.cc',

- 'protocol/fake_connection.h',

+ 'protocol/fake_session.cc',

+ 'protocol/fake_session.h',

'protocol/session_manager_pair.cc',

'protocol/session_manager_pair.h',

'run_all_unittests.cc',

« no previous file with comments | « remoting/protocol/video_writer.h ('k') | no next file » | no next file with comments »