Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(525)

Unified Diff: remoting/protocol/jingle_session.h

Issue 4446005: Chromoting: Rename ChromotocolConfig -> SessionConfig (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Rename candidate_config vars Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/jingle_connection_to_host.cc ('k') | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session.h
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index dcebbd1e73a6f9ddc12d2c8f89711687342ec900..32654fc1c747d8d53fa8b12bf38ed30c7514a062 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -51,10 +51,10 @@ class JingleSession : public protocol::Session,
virtual const std::string& jid();
virtual MessageLoop* message_loop();
- virtual const CandidateChromotocolConfig* candidate_config();
- virtual const ChromotocolConfig* config();
+ virtual const CandidateSessionConfig* candidate_config();
+ virtual const SessionConfig* config();
- virtual void set_config(const ChromotocolConfig* config);
+ virtual void set_config(const SessionConfig* config);
virtual void Close(Task* closed_task);
@@ -65,7 +65,7 @@ class JingleSession : public protocol::Session,
friend class JingleSessionManager;
// Called by JingleSessionManager.
- void set_candidate_config(const CandidateChromotocolConfig* candidate_config);
+ void set_candidate_config(const CandidateSessionConfig* candidate_config);
void Init(cricket::Session* cricket_session);
bool HasSession(cricket::Session* cricket_session);
cricket::Session* ReleaseSession();
@@ -95,8 +95,8 @@ class JingleSession : public protocol::Session,
// The corresponding libjingle session.
cricket::Session* cricket_session_;
- scoped_ptr<const CandidateChromotocolConfig> candidate_config_;
- scoped_ptr<const ChromotocolConfig> config_;
+ scoped_ptr<const CandidateSessionConfig> candidate_config_;
+ scoped_ptr<const SessionConfig> config_;
cricket::PseudoTcpChannel* control_channel_;
scoped_ptr<StreamSocketAdapter> control_channel_adapter_;
« no previous file with comments | « remoting/protocol/jingle_connection_to_host.cc ('k') | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698