diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 02:41:31 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 02:41:31 +0000 |
| commit | cb68c0239fd762b3984623a9d1064299334061b0 (patch) | |
| tree | 7d7eb1feca6bd65ddaf33c0a3e605578845bfccf /remoting/protocol | |
| parent | 51f1b9d4c685f0e4de67023c07476fb471cd4014 (diff) | |
| download | chromium_src-cb68c0239fd762b3984623a9d1064299334061b0.zip chromium_src-cb68c0239fd762b3984623a9d1064299334061b0.tar.gz chromium_src-cb68c0239fd762b3984623a9d1064299334061b0.tar.bz2 | |
Rename ChromotingView to ClientUserInterface. Clean it up.
ChromotingView wasn't really doing what it was initially meant to do,
now FrameProducer and FrameConsumer interfaces are used to process video
stream. Renamed and simplified that interface. Also moved implementation
from PepperView to ChromotingInstance.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=147595
Review URL: https://chromiumcodereview.appspot.com/10703144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/connection_to_host.cc | 4 | ||||
| -rw-r--r-- | remoting/protocol/connection_to_host.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc index b869b3c..5794c50 100644 --- a/remoting/protocol/connection_to_host.cc +++ b/remoting/protocol/connection_to_host.cc @@ -36,7 +36,7 @@ ConnectionToHost::ConnectionToHost( clipboard_stub_(NULL), video_stub_(NULL), audio_stub_(NULL), - state_(CONNECTING), + state_(INITIALIZING), error_(OK) { } @@ -88,6 +88,8 @@ void ConnectionToHost::Connect(scoped_refptr<XmppProxy> xmpp_proxy, session_manager_.reset(new JingleSessionManager( transport_factory.Pass(), allow_nat_traversal_)); session_manager_->Init(signal_strategy_.get(), this); + + SetState(CONNECTING, OK); } void ConnectionToHost::Disconnect(const base::Closure& shutdown_task) { diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h index 165dcad..4eb7d15 100644 --- a/remoting/protocol/connection_to_host.h +++ b/remoting/protocol/connection_to_host.h @@ -51,6 +51,7 @@ class ConnectionToHost : public SignalStrategy::Listener, public base::NonThreadSafe { public: enum State { + INITIALIZING, CONNECTING, CONNECTED, FAILED, |