Cleanups in ChromotingClient

remoting/client/plugin/chromoting_instance.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 84 matching lines @@
   // Backward-compatibility version used by for the messaging
   // interface. Should be updated whenever we remove support for
   // an older version of the API.
   static const int kApiMinMessagingVersion = 5;
 
   // Backward-compatibility version used by for the ScriptableObject
   // interface. Should be updated whenever we remove support for
   // an older version of the API.
   static const int kApiMinScriptableVersion = 5;
 
-  // Helper method to parse authentication_methods parameter.
-  static bool ParseAuthMethods(const std::string& auth_methods,
-                               ClientConfig* config);
-
   explicit ChromotingInstance(PP_Instance instance);
   virtual ~ChromotingInstance();
 
   // pp::Instance interface.
   virtual void DidChangeFocus(bool has_focus) OVERRIDE;
   virtual void DidChangeView(const pp::View& view) OVERRIDE;
   virtual bool Init(uint32_t argc, const char* argn[],
                     const char* argv[]) OVERRIDE;
   virtual void HandleMessage(const pp::Var& message) OVERRIDE;
   virtual bool HandleInputEvent(const pp::InputEvent& event) OVERRIDE;
 
   // ClientUserInterface interface.
   virtual void OnConnectionState(protocol::ConnectionToHost::State state,
                                  protocol::ErrorCode error) OVERRIDE;
   virtual void OnConnectionReady(bool ready) OVERRIDE;
   virtual void OnRouteChanged(const std::string& channel_name,
                               const protocol::TransportRoute& route) OVERRIDE;
   virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
   virtual void SetPairingResponse(
       const protocol::PairingResponse& pairing_response) OVERRIDE;
   virtual void DeliverHostMessage(
       const protocol::ExtensionMessage& message) OVERRIDE;
   virtual protocol::ClipboardStub* GetClipboardStub() OVERRIDE;
   virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE;
-  virtual scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>
-  GetTokenFetcher(const std::string& host_public_key) OVERRIDE;
 
   // protocol::ClipboardStub interface.
   virtual void InjectClipboardEvent(
       const protocol::ClipboardEvent& event) OVERRIDE;
 
   // protocol::CursorShapeStub interface.
   virtual void SetCursorShape(
       const protocol::CursorShapeInfo& cursor_shape) OVERRIDE;
 
   // Called by PepperView.
@@ skipping 61 matching lines @@
   void HandlePauseAudio(const base::DictionaryValue& data);
   void HandleOnPinFetched(const base::DictionaryValue& data);
   void HandleOnThirdPartyTokenFetched(const base::DictionaryValue& data);
   void HandleRequestPairing(const base::DictionaryValue& data);
   void HandleExtensionMessage(const base::DictionaryValue& data);
   void HandleAllowMouseLockMessage();
   void HandleEnableMediaSourceRendering();
   void HandleSendMouseInputWhenUnfocused();
   void HandleDelegateLargeCursors();
 
-  // Helper method called from Connect() to connect with parsed config.
-  void ConnectWithConfig(const ClientConfig& config,
-                         const std::string& local_jid);
-
   // Helper method to post messages to the webapp.
   void PostChromotingMessage(const std::string& method,
                              const pp::VarDictionary& data);
 
   // Same as above, but serializes messages to JSON before sending them.  This
   // method is used for backward compatibility with older version of the webapp
   // that expect to received most messages formatted using JSON.
   //
   // TODO(sergeyu): When all current versions of the webapp support raw messages
   // remove this method and use PostChromotingMessage() instead.
@@ skipping 40 matching lines @@
   scoped_ptr<VideoRenderer> video_renderer_;
   scoped_ptr<PepperView> view_;
   scoped_ptr<base::WeakPtrFactory<FrameConsumer> > view_weak_factory_;
   pp::View plugin_view_;
 
   // Contains the most-recently-reported desktop shape, if any.
   scoped_ptr<webrtc::DesktopRegion> desktop_shape_;
 
   scoped_ptr<DelegatingSignalStrategy> signal_strategy_;
 
-  scoped_ptr<protocol::ConnectionToHost> host_connection_;
   scoped_ptr<ChromotingClient> client_;
 
   // Input pipeline components, in reverse order of distance from input source.
   protocol::MouseInputFilter mouse_input_filter_;
   protocol::InputEventTracker input_tracker_;
   KeyEventMapper key_mapper_;
   scoped_ptr<protocol::InputFilter> normalizing_input_filter_;
   PepperInputHandler input_handler_;
 
   // PIN Fetcher.
@@ skipping 13 matching lines @@
 
   // Weak reference to this instance, used for global logging and task posting.
   base::WeakPtrFactory<ChromotingInstance> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_