Chromoting: Rename ChromotocolConfig -> SessionConfig

remoting/host/chromoting_host.cc

 // Copyright (c) 2010 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.
 
 #include "remoting/host/chromoting_host.h"
 
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "build/build_config.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/encoder.h"
 #include "remoting/base/encoder_verbatim.h"
 #include "remoting/base/encoder_vp8.h"
 #include "remoting/base/encoder_zlib.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/capturer.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/host_config.h"
 #include "remoting/host/session_manager.h"
-#include "remoting/protocol/chromotocol_config.h"
+#include "remoting/protocol/session_config.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/connection_to_client.h"
 
 using remoting::protocol::ConnectionToClient;
 
 namespace remoting {
 
 ChromotingHost::ChromotingHost(ChromotingHostContext* context,
                                MutableHostConfig* config,
                                Capturer* capturer,
@@ skipping 222 matching lines @@
     *response = protocol::SessionManager::DECLINE;
     return;
   }
 
   // Check that the user has access to the host.
   if (!access_verifier_.VerifyPermissions(session->jid())) {
     *response = protocol::SessionManager::DECLINE;
     return;
   }
 
-  scoped_ptr<CandidateChromotocolConfig> local_config(
-      CandidateChromotocolConfig::CreateDefault());
+  scoped_ptr<protocol::CandidateSessionConfig>
+      local_config(protocol::CandidateSessionConfig::CreateDefault());
   local_config->SetInitialResolution(
-      ScreenResolution(capturer_->width(), capturer_->height()));
+      protocol::ScreenResolution(capturer_->width(), capturer_->height()));
   // TODO(sergeyu): Respect resolution requested by the client if supported.
-  ChromotocolConfig* config =
-      local_config->Select(session->candidate_config(),
-                           true /* force_host_resolution */);
+  protocol::SessionConfig* config = local_config->Select(
+      session->candidate_config(), true /* force_host_resolution */);
 
   if (!config) {
     LOG(WARNING) << "Rejecting connection from " << session->jid()
                  << " because no compatible configuration has been found.";
     *response = protocol::SessionManager::INCOMPATIBLE;
     return;
   }
 
   session->set_config(config);
 
   *response = protocol::SessionManager::ACCEPT;
 
   VLOG(1) << "Client connected: " << session->jid();
 
   // If we accept the connected then create a client object and set the
   // callback.
   connection_ = new ConnectionToClient(context_->main_message_loop(), this);
   connection_->Init(session);
 }
 
 void ChromotingHost::OnServerClosed() {
   // Don't need to do anything here.
 }
 
 // TODO(sergeyu): Move this to SessionManager?
-Encoder* ChromotingHost::CreateEncoder(const ChromotocolConfig* config) {
-  const ChannelConfig& video_config = config->video_config();
+Encoder* ChromotingHost::CreateEncoder(const protocol::SessionConfig* config) {
+  const protocol::ChannelConfig& video_config = config->video_config();
 
-  if (video_config.codec == ChannelConfig::CODEC_VERBATIM) {
+  if (video_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
     return new remoting::EncoderVerbatim();
-  } else if (video_config.codec == ChannelConfig::CODEC_ZIP) {
+  } else if (video_config.codec == protocol::ChannelConfig::CODEC_ZIP) {
     return new remoting::EncoderZlib();
   }
   // TODO(sergeyu): Enable VP8 on ARM builds.
 #if !defined(ARCH_CPU_ARM_FAMILY)
-  else if (video_config.codec == ChannelConfig::CODEC_VP8) {
+  else if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
     return new remoting::EncoderVp8();
   }
 #endif
 
   return NULL;
 }
 
 }  // namespace remoting