Cleanup error handling in the client plugin.

remoting/protocol/connection_to_host.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_PROTOCOL_CONNECTION_TO_HOST_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/proto/internal.pb.h"
+#include "remoting/protocol/errors.h"
 #include "remoting/protocol/input_filter.h"
 #include "remoting/protocol/message_reader.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_manager.h"
 
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
 
 namespace pp {
@@ skipping 20 matching lines @@
 class ConnectionToHost : public SignalStrategy::Listener,
                          public SessionManager::Listener {
  public:
   enum State {
     CONNECTING,
     CONNECTED,
     FAILED,
     CLOSED,
   };
 
-  enum Error {
-    OK,
-    HOST_IS_OFFLINE,
-    SESSION_REJECTED,
-    INCOMPATIBLE_PROTOCOL,
-    NETWORK_FAILURE,
-  };
-
   class HostEventCallback {
    public:
     virtual ~HostEventCallback() {}
 
     // Called when state of the connection changes.
-    virtual void OnConnectionState(State state, Error error) = 0;
+    virtual void OnConnectionState(State state, ErrorCode error) = 0;
   };
 
   ConnectionToHost(base::MessageLoopProxy* message_loop,
                    pp::Instance* pp_instance,
                    bool allow_nat_traversal);
   virtual ~ConnectionToHost();
 
   virtual void Connect(scoped_refptr<XmppProxy> xmpp_proxy,
                        const std::string& local_jid,
                        const std::string& host_jid,
@@ skipping 30 matching lines @@
   void OnSessionStateChange(Session::State state);
 
   // Callbacks for channel initialization
   void OnChannelInitialized(bool successful);
 
   void NotifyIfChannelsReady();
 
   // Callback for |video_reader_|.
   void OnVideoPacket(VideoPacket* packet);
 
-  void CloseOnError(Error error);
+  void CloseOnError(ErrorCode error);
 
   // Stops writing in the channels.
   void CloseChannels();
 
-  void SetState(State state, Error error);
+  void SetState(State state, ErrorCode error);
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   pp::Instance* pp_instance_;
   bool allow_nat_traversal_;
 
   std::string host_jid_;
   std::string host_public_key_;
   scoped_ptr<Authenticator> authenticator_;
 
   HostEventCallback* event_callback_;
 
   // Stub for incoming messages.
   ClientStub* client_stub_;
   VideoStub* video_stub_;
 
   scoped_ptr<SignalStrategy> signal_strategy_;
   scoped_ptr<SessionManager> session_manager_;
   scoped_ptr<Session> session_;
 
   scoped_ptr<VideoReader> video_reader_;
   scoped_ptr<ClientControlDispatcher> control_dispatcher_;
   scoped_ptr<ClientEventDispatcher> event_dispatcher_;
   InputFilter event_forwarder_;
 
   // Internal state of the connection.
   State state_;
-  Error error_;
+  ErrorCode error_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_