summaryrefslogtreecommitdiffstats
path: root/remoting/client
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/client
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/client')
-rw-r--r--remoting/client/chromoting_view_unittest.cc2
-rw-r--r--remoting/client/input_handler.cc2
-rw-r--r--remoting/client/input_handler.h2
-rw-r--r--remoting/client/rectangle_update_decoder.cc1
4 files changed, 4 insertions, 3 deletions
diff --git a/remoting/client/chromoting_view_unittest.cc b/remoting/client/chromoting_view_unittest.cc
index c376d10..4b31435 100644
--- a/remoting/client/chromoting_view_unittest.cc
+++ b/remoting/client/chromoting_view_unittest.cc
@@ -4,8 +4,8 @@
#include "base/scoped_ptr.h"
#include "remoting/base/decoder.h"
-#include "remoting/base/protocol/chromotocol.pb.h"
#include "remoting/client/chromoting_view.h"
+#include "remoting/proto/internal.pb.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/client/input_handler.cc b/remoting/client/input_handler.cc
index 7f6f7ab..69c70c5 100644
--- a/remoting/client/input_handler.cc
+++ b/remoting/client/input_handler.cc
@@ -6,6 +6,8 @@
#include "remoting/client/chromoting_view.h"
#include "remoting/client/host_connection.h"
+// TODO(hclam): Should not include internal.pb.h.
+#include "remoting/proto/internal.pb.h"
namespace remoting {
diff --git a/remoting/client/input_handler.h b/remoting/client/input_handler.h
index 61b9bb9..6f2e376 100644
--- a/remoting/client/input_handler.h
+++ b/remoting/client/input_handler.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/task.h"
-#include "remoting/base/protocol/chromotocol.pb.h"
+#include "remoting/proto/event.pb.h"
namespace remoting {
diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc
index aa87c4a..8471991 100644
--- a/remoting/client/rectangle_update_decoder.cc
+++ b/remoting/client/rectangle_update_decoder.cc
@@ -9,7 +9,6 @@
#include "media/base/callback.h"
#include "remoting/base/decoder.h"
#include "remoting/base/decoder_row_based.h"
-#include "remoting/base/protocol/chromotocol.pb.h"
#include "remoting/base/tracer.h"
#include "remoting/base/util.h"
#include "remoting/client/frame_consumer.h"