Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Unified Diff: remoting/client/jni/chromoting_jni_instance.cc

Issue 282063005: Pull out common code from client and host versions of ServerLogEntry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | remoting/client/log_to_server.h » ('j') | remoting/client/server_log_entry_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/jni/chromoting_jni_instance.cc
diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc
index 3f9bd22fcd15f95336ab9b66c544ee1f3ed08e75..0f117de6f93a4c3f9ab128927e8584e1a87018f7 100644
--- a/remoting/client/jni/chromoting_jni_instance.cc
+++ b/remoting/client/jni/chromoting_jni_instance.cc
@@ -13,13 +13,13 @@
#include "remoting/client/jni/android_keymap.h"
#include "remoting/client/jni/chromoting_jni_runtime.h"
#include "remoting/client/log_to_server.h"
-#include "remoting/client/server_log_entry.h"
#include "remoting/client/software_video_renderer.h"
#include "remoting/jingle_glue/chromium_port_allocator.h"
#include "remoting/jingle_glue/chromium_socket_factory.h"
#include "remoting/jingle_glue/network_settings.h"
#include "remoting/protocol/host_stub.h"
#include "remoting/protocol/libjingle_transport_factory.h"
+#include "remoting/protocol/server_log_entry.h"
rmsousa 2014/05/20 00:54:41 Nit: Not sure if protocol is the right long-term h
Lambros 2014/05/20 01:13:35 It would be slightly cleaner without the protocol:
Sergey Ulanov 2014/05/21 04:02:36 Hm. Good question. I suggest putting this stuff in
namespace remoting {
@@ -336,7 +336,7 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() {
net::ClientSocketFactory::GetDefaultFactory(),
jni_runtime_->url_requester(), xmpp_config_));
- log_to_server_.reset(new client::LogToServer(client::ServerLogEntry::ME2ME,
+ log_to_server_.reset(new client::LogToServer(protocol::ServerLogEntry::ME2ME,
signaling_.get(),
"remoting@bot.talk.google.com"));
« no previous file with comments | « no previous file | remoting/client/log_to_server.h » ('j') | remoting/client/server_log_entry_client.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698