summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 20:09:50 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 20:09:50 +0000
commite976a17124ab2fc3df0947867ca1941e9245e627 (patch)
treedf335eb26b1822d135964fe14a6ec6ef72692dd7 /remoting/host
parent41dd4a311c4c683367201bfe876a2d6f220e5319 (diff)
downloadchromium_src-e976a17124ab2fc3df0947867ca1941e9245e627.zip
chromium_src-e976a17124ab2fc3df0947867ca1941e9245e627.tar.gz
chromium_src-e976a17124ab2fc3df0947867ca1941e9245e627.tar.bz2
Move chromotocol.proto to remoting/protocol
Move the proto file and split it into multiple smaller proto files. BUG=None TEST=None Review URL: http://codereview.chromium.org/3808002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/client_connection.h2
-rw-r--r--remoting/host/event_executor_win.cc2
-rw-r--r--remoting/host/session_manager.h3
3 files changed, 5 insertions, 2 deletions
diff --git a/remoting/host/client_connection.h b/remoting/host/client_connection.h
index 44bb761..6eb6b0d 100644
--- a/remoting/host/client_connection.h
+++ b/remoting/host/client_connection.h
@@ -11,7 +11,7 @@
#include "base/message_loop.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
-#include "remoting/base/protocol/chromotocol.pb.h"
+#include "remoting/proto/internal.pb.h"
#include "remoting/protocol/chromoting_connection.h"
#include "remoting/protocol/stream_reader.h"
#include "remoting/protocol/stream_writer.h"
diff --git a/remoting/host/event_executor_win.cc b/remoting/host/event_executor_win.cc
index bf5df99..283d4aa 100644
--- a/remoting/host/event_executor_win.cc
+++ b/remoting/host/event_executor_win.cc
@@ -8,6 +8,8 @@
#include "app/keyboard_codes.h"
#include "base/stl_util-inl.h"
#include "remoting/host/capturer.h"
+// TODO(hclam): Should not include internal.pb.h here.
+#include "remoting/proto/internal.pb.h"
namespace remoting {
diff --git a/remoting/host/session_manager.h b/remoting/host/session_manager.h
index c39ca3b..064870f 100644
--- a/remoting/host/session_manager.h
+++ b/remoting/host/session_manager.h
@@ -13,8 +13,9 @@
#include "base/scoped_ptr.h"
#include "base/time.h"
#include "remoting/base/encoder.h"
-#include "remoting/base/protocol/chromotocol.pb.h"
#include "remoting/host/capturer.h"
+// TODO(hclam): This class should not know the internal protobuf types.
+#include "remoting/proto/internal.pb.h"
namespace media {