From c3ddba29664d91b8910489150171496b28355bbb Mon Sep 17 00:00:00 2001
From: "garykac@chromium.org"
 <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 8 Nov 2010 23:34:23 +0000
Subject: Chromoting: Rename ChromotocolConfig -> SessionConfig

BUG=none
TEST=build chrome, chromoting

Review URL: http://codereview.chromium.org/4446005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65451 0039d316-1c4b-4281-b951-d872f2087c98
---
 remoting/host/chromoting_host.cc | 23 +++++++++++------------
 remoting/host/chromoting_host.h  |  4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'remoting/host')

diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 9e265fb..8a62459 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -17,7 +17,7 @@
 #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"
 
@@ -260,14 +260,13 @@ void ChromotingHost::OnNewClientSession(
     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()
@@ -293,17 +292,17 @@ void ChromotingHost::OnServerClosed() {
 }
 
 // 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
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index 2fdcadb..6616c24 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -24,11 +24,11 @@ namespace remoting {
 
 namespace protocol {
 class ConnectionToClient;
+class SessionConfig;
 }  // namespace protocol
 
 class Capturer;
 class ChromotingHostContext;
-class ChromotocolConfig;
 class Encoder;
 class EventExecutor;
 class MutableHostConfig;
@@ -119,7 +119,7 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
   void OnServerClosed();
 
   // Creates encoder for the specified configuration.
-  Encoder* CreateEncoder(const ChromotocolConfig* config);
+  Encoder* CreateEncoder(const protocol::SessionConfig* config);
 
   // The context that the chromoting host runs on.
   ChromotingHostContext* context_;
-- 
cgit v1.1