summaryrefslogtreecommitdiffstats
path: root/remoting/client/plugin
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 00:46:01 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 00:46:01 +0000
commitd87c404738c7c89968ee01353d71d3a31f91669f (patch)
tree91e581d1d29cbcb64f22634961bb212b674ed1c7 /remoting/client/plugin
parentde9bdd1e4d2f87f53b1c2d3eacfbe43ef6ca1019 (diff)
downloadchromium_src-d87c404738c7c89968ee01353d71d3a31f91669f.zip
chromium_src-d87c404738c7c89968ee01353d71d3a31f91669f.tar.gz
chromium_src-d87c404738c7c89968ee01353d71d3a31f91669f.tar.bz2
Move protocol classes to the remoting::protocol namespace
BUG=None TEST=compiles Review URL: http://codereview.chromium.org/4233005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/plugin')
-rw-r--r--remoting/client/plugin/chromoting_instance.cc2
-rw-r--r--remoting/client/plugin/chromoting_instance.h7
-rw-r--r--remoting/client/plugin/pepper_input_handler.cc2
-rw-r--r--remoting/client/plugin/pepper_input_handler.h2
4 files changed, 8 insertions, 5 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 67979c0..80ce290 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -67,7 +67,7 @@ bool ChromotingInstance::Init(uint32_t argc,
context_.Start();
// Create the chromoting objects.
- host_connection_.reset(new JingleHostConnection(&context_));
+ host_connection_.reset(new protocol::JingleHostConnection(&context_));
view_.reset(new PepperView(this, &context_));
rectangle_decoder_.reset(
new RectangleUpdateDecoder(context_.decode_message_loop(), view_.get()));
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index f706478..9f6bec2 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -36,12 +36,15 @@ namespace remoting {
class ChromotingClient;
class ClientContext;
-class HostConnection;
class InputHandler;
class JingleThread;
class PepperView;
class RectangleUpdateDecoder;
+namespace protocol {
+class HostConnection;
+} // namespace protocol
+
class ChromotingInstance : public pp::Instance {
public:
// The mimetype for which this plugin is registered.
@@ -74,7 +77,7 @@ class ChromotingInstance : public pp::Instance {
MessageLoop* pepper_main_loop_dont_post_to_me_;
ClientContext context_;
- scoped_ptr<HostConnection> host_connection_;
+ scoped_ptr<protocol::HostConnection> host_connection_;
scoped_ptr<PepperView> view_;
scoped_ptr<RectangleUpdateDecoder> rectangle_decoder_;
scoped_ptr<InputHandler> input_handler_;
diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc
index 5599655..3398cf4 100644
--- a/remoting/client/plugin/pepper_input_handler.cc
+++ b/remoting/client/plugin/pepper_input_handler.cc
@@ -9,7 +9,7 @@
namespace remoting {
PepperInputHandler::PepperInputHandler(ClientContext* context,
- HostConnection* connection,
+ protocol::HostConnection* connection,
ChromotingView* view)
: InputHandler(context, connection, view) {
}
diff --git a/remoting/client/plugin/pepper_input_handler.h b/remoting/client/plugin/pepper_input_handler.h
index f7ad657..14df881 100644
--- a/remoting/client/plugin/pepper_input_handler.h
+++ b/remoting/client/plugin/pepper_input_handler.h
@@ -16,7 +16,7 @@ namespace remoting {
class PepperInputHandler : public InputHandler {
public:
PepperInputHandler(ClientContext* context,
- HostConnection* connection,
+ protocol::HostConnection* connection,
ChromotingView* view);
virtual ~PepperInputHandler();