diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-12-17 21:43:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-18 05:44:17 +0000 |
| commit | d3022d36ffa5f4dc0819e87b0fd9ea5f7d2445fe (patch) | |
| tree | cb19a8adab5a9ecf24e59aebcb44bb1a4c31bb8a /remoting/client | |
| parent | 281a441e2518780bd09cf918abbc6b8d820f4f2f (diff) | |
| download | chromium_src-d3022d36ffa5f4dc0819e87b0fd9ea5f7d2445fe.zip chromium_src-d3022d36ffa5f4dc0819e87b0fd9ea5f7d2445fe.tar.gz chromium_src-d3022d36ffa5f4dc0819e87b0fd9ea5f7d2445fe.tar.bz2 | |
Rename ConnectionToHostImpl -> IceConnectionToHost
We will have another implementation of ConnectionToHost. Renaming the
current implementation will make it easier to distinguish between them.
BUG=547158
Review URL: https://codereview.chromium.org/1532123005
Cr-Commit-Position: refs/heads/master@{#366024}
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/chromoting_client.cc | 3 | ||||
| -rw-r--r-- | remoting/client/chromoting_client.h | 3 | ||||
| -rw-r--r-- | remoting/client/jni/chromoting_jni_instance.h | 2 | ||||
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc index 075bf30..2086553 100644 --- a/remoting/client/chromoting_client.cc +++ b/remoting/client/chromoting_client.cc @@ -13,6 +13,7 @@ #include "remoting/protocol/authenticator.h" #include "remoting/protocol/connection_to_host.h" #include "remoting/protocol/host_stub.h" +#include "remoting/protocol/ice_connection_to_host.h" #include "remoting/protocol/ice_transport.h" #include "remoting/protocol/jingle_session_manager.h" #include "remoting/protocol/session_config.h" @@ -26,7 +27,7 @@ ChromotingClient::ChromotingClient(ClientContext* client_context, scoped_ptr<AudioPlayer> audio_player) : user_interface_(user_interface), video_renderer_(video_renderer), - connection_(new protocol::ConnectionToHostImpl()) { + connection_(new protocol::IceConnectionToHost()) { DCHECK(client_context->main_task_runner()->BelongsToCurrentThread()); if (audio_player) { audio_decode_scheduler_.reset(new AudioDecodeScheduler( diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h index 6c179f4..9bcb929 100644 --- a/remoting/client/chromoting_client.h +++ b/remoting/client/chromoting_client.h @@ -14,9 +14,9 @@ #include "remoting/protocol/client_stub.h" #include "remoting/protocol/clipboard_stub.h" #include "remoting/protocol/connection_to_host.h" -#include "remoting/protocol/connection_to_host_impl.h" #include "remoting/protocol/input_stub.h" #include "remoting/protocol/performance_tracker.h" +#include "remoting/protocol/session_config.h" #include "remoting/protocol/video_stub.h" #include "remoting/signaling/signal_strategy.h" @@ -28,6 +28,7 @@ namespace remoting { namespace protocol { class CandidateSessionConfig; +class SessionManager; class TransportContext; } // namespace protocol diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h index b48aaff..c8ff15f 100644 --- a/remoting/client/jni/chromoting_jni_instance.h +++ b/remoting/client/jni/chromoting_jni_instance.h @@ -14,6 +14,8 @@ #include "remoting/client/chromoting_client.h" #include "remoting/client/client_context.h" #include "remoting/client/client_user_interface.h" +#include "remoting/proto/control.pb.h" +#include "remoting/proto/event.pb.h" #include "remoting/protocol/clipboard_stub.h" #include "remoting/protocol/cursor_shape_stub.h" #include "remoting/signaling/xmpp_signal_strategy.h" diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index 93918de..5f71ccd 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -50,6 +50,7 @@ #include "remoting/client/plugin/pepper_video_renderer_3d.h" #include "remoting/client/software_video_renderer.h" #include "remoting/client/token_fetcher_proxy.h" +#include "remoting/proto/control.pb.h" #include "remoting/protocol/connection_to_host.h" #include "remoting/protocol/host_stub.h" #include "remoting/protocol/transport_context.h" |