Refactor the client code for the X11 version.

Make ChromotingViews responsible for initializing themselves.
Move all x11-related code into X11View.
Create InputCapturer class manage client input capture.

BUG=none
TEST=ran Win host + X11 client

Review URL: http://codereview.chromium.org/2861047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52973 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/remoting/client/plugin/chromoting_plugin.h b/remoting/client/plugin/chromoting_plugin.h
index 0aac051..3bd0470 100644
--- a/remoting/client/plugin/chromoting_plugin.h
+++ b/remoting/client/plugin/chromoting_plugin.h
@@ -34,7 +34,9 @@ class Module;
 namespace remoting {
 
 class ChromotingClient;
+class ClientContext;
 class HostConnection;
+class InputHandler;
 class JingleThread;
 class PepperView;
 
@@ -56,11 +58,6 @@ class ChromotingPlugin : public pp::Instance {
   FRIEND_TEST(ChromotingPluginTest, ParseUrl);
   FRIEND_TEST(ChromotingPluginTest, TestCaseSetup);
 
-  static bool ParseUrl(const std::string& url,
-                       std::string* user_id,
-                       std::string* auth_token,
-                       std::string* host_jid);
-
   // Since we're an internal plugin, we can just grab the message loop during
   // init to figure out which thread we're on.  This should only be used to
   // sanity check which thread we're executing on. Do not post task here!
@@ -69,11 +66,14 @@ class ChromotingPlugin : public pp::Instance {
   // TODO(ajwong): Think if there is a better way to safeguard this.
   MessageLoop* pepper_main_loop_dont_post_to_me_;
 
-  scoped_ptr<base::Thread> main_thread_;
-  scoped_ptr<JingleThread> network_thread_;
+  scoped_ptr<ClientContext> context_;
 
   scoped_ptr<HostConnection> host_connection_;
+
   scoped_ptr<PepperView> view_;
+
+  scoped_ptr<InputHandler> input_handler_;
+
   scoped_ptr<ChromotingClient> client_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingPlugin);