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

Unified Diff: remoting/protocol/session.h

Issue 4313001: Rename classes for Chromoting: (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Resolve merge conflicts 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/rtp_video_writer.cc ('k') | remoting/protocol/session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/session.h
diff --git a/remoting/protocol/chromotocol_connection.h b/remoting/protocol/session.h
similarity index 85%
rename from remoting/protocol/chromotocol_connection.h
rename to remoting/protocol/session.h
index bbb458602317a8ae6e05d148276def75aa3bf49a..9319fef04d8510f634eeab7abb4c4e3a92a00e25 100644
--- a/remoting/protocol/chromotocol_connection.h
+++ b/remoting/protocol/session.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef REMOTING_PROTOCOL_CHROMOTOCOL_CONNECTION_H_
-#define REMOTING_PROTOCOL_CHROMOTOCOL_CONNECTION_H_
+#ifndef REMOTING_PROTOCOL_SESSION_H_
+#define REMOTING_PROTOCOL_SESSION_H_
#include <string>
@@ -19,12 +19,14 @@ class Socket;
namespace remoting {
+namespace protocol {
+
// Generic interface for Chromotocol connection used by both client and host.
// Provides access to the connection channels, but doesn't depend on the
// protocol used for each channel.
// TODO(sergeyu): Remove refcounting?
-class ChromotocolConnection
- : public base::RefCountedThreadSafe<ChromotocolConnection> {
+class Session
+ : public base::RefCountedThreadSafe<Session> {
public:
enum State {
INITIALIZING,
@@ -80,15 +82,17 @@ class ChromotocolConnection
virtual void Close(Task* closed_task) = 0;
protected:
- friend class base::RefCountedThreadSafe<ChromotocolConnection>;
+ friend class base::RefCountedThreadSafe<Session>;
- ChromotocolConnection() { }
- virtual ~ChromotocolConnection() { }
+ Session() { }
+ virtual ~Session() { }
private:
- DISALLOW_COPY_AND_ASSIGN(ChromotocolConnection);
+ DISALLOW_COPY_AND_ASSIGN(Session);
};
+} // namespace protocol
+
} // namespace remoting
-#endif // REMOTING_PROTOCOL_CHROMOTOCOL_CONNECTION_H_
+#endif // REMOTING_PROTOCOL_SESSION_H_
« no previous file with comments | « remoting/protocol/rtp_video_writer.cc ('k') | remoting/protocol/session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698