summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 21:51:45 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 21:51:45 +0000
commitad7efa18a563fef8807861aca3f7cd0dd37cc867 (patch)
treee6fb297775ea1e4e475971060e09512040975fbd /remoting/protocol
parentb63ee7d44b78b937b2ce08b38516dfc6e4a01efe (diff)
downloadchromium_src-ad7efa18a563fef8807861aca3f7cd0dd37cc867.zip
chromium_src-ad7efa18a563fef8807861aca3f7cd0dd37cc867.tar.gz
chromium_src-ad7efa18a563fef8807861aca3f7cd0dd37cc867.tar.bz2
Remove BeginSessionDeprecated.
Once M17 is released no clients will need BeginSession message from the host, so it's safe to remove it. BUG=104670 Review URL: https://chromiumcodereview.appspot.com/9243021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/client_control_dispatcher.cc11
-rw-r--r--remoting/protocol/host_control_dispatcher.cc9
2 files changed, 3 insertions, 17 deletions
diff --git a/remoting/protocol/client_control_dispatcher.cc b/remoting/protocol/client_control_dispatcher.cc
index 54e1d1c..79ae7be 100644
--- a/remoting/protocol/client_control_dispatcher.cc
+++ b/remoting/protocol/client_control_dispatcher.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -37,15 +37,8 @@ void ClientControlDispatcher::OnInitialized() {
void ClientControlDispatcher::OnMessageReceived(
ControlMessage* message, const base::Closure& done_task) {
DCHECK(client_stub_);
-
base::ScopedClosureRunner done_runner(done_task);
-
- if (message->has_begin_session_deprecated()) {
- // Host sends legacy BeginSession message for compatibility with
- // older clients. Ignore it without warning.
- } else {
- LOG(WARNING) << "Unknown control message received.";
- }
+ LOG(WARNING) << "Unknown control message received.";
}
} // namespace protocol
diff --git a/remoting/protocol/host_control_dispatcher.cc b/remoting/protocol/host_control_dispatcher.cc
index 43f4f8f..a51058c 100644
--- a/remoting/protocol/host_control_dispatcher.cc
+++ b/remoting/protocol/host_control_dispatcher.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -30,13 +30,6 @@ void HostControlDispatcher::OnInitialized() {
reader_.Init(channel(), base::Bind(
&HostControlDispatcher::OnMessageReceived, base::Unretained(this)));
writer_->Init(channel(), BufferedSocketWriter::WriteFailedCallback());
-
- // Write legacy BeginSession message.
- // TODO(sergeyu): Remove it. See http://crbug.com/104670 .
- protocol::ControlMessage message;
- message.mutable_begin_session_deprecated()->mutable_login_status()->
- set_success(true);
- writer_->Write(SerializeAndFrameMessage(message), base::Closure());
}
void HostControlDispatcher::OnMessageReceived(