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

Side by Side Diff: remoting/protocol/connection_to_host.h

Issue 187313007: Reimplemented string array resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 9 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_ 5 #ifndef REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
6 #define REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_ 6 #define REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 class TransportFactory; 45 class TransportFactory;
46 class VideoReader; 46 class VideoReader;
47 class VideoStub; 47 class VideoStub;
48 48
49 class ConnectionToHost : public SignalStrategy::Listener, 49 class ConnectionToHost : public SignalStrategy::Listener,
50 public SessionManager::Listener, 50 public SessionManager::Listener,
51 public Session::EventHandler, 51 public Session::EventHandler,
52 public base::NonThreadSafe { 52 public base::NonThreadSafe {
53 public: 53 public:
54 // The UI implementations maintain corresponding definitions of this 54 // The UI implementations maintain corresponding definitions of this
55 // enumeration in webapp/client_session.js, 55 // enumeration in webapp/client_session.js and
56 // android/java/res/values/strings.xml and
57 // android/java/src/org/chromium/chromoting/jni/JniInterface.java. Be sure to 56 // android/java/src/org/chromium/chromoting/jni/JniInterface.java. Be sure to
58 // update these locations if you make any changes to the ordering. 57 // update these locations if you make any changes to the ordering.
59 enum State { 58 enum State {
60 INITIALIZING, 59 INITIALIZING,
61 CONNECTING, 60 CONNECTING,
62 AUTHENTICATED, 61 AUTHENTICATED,
63 CONNECTED, 62 CONNECTED,
64 FAILED, 63 FAILED,
65 CLOSED, 64 CLOSED,
66 }; 65 };
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 std::set<std::string> not_ready_channels_; 173 std::set<std::string> not_ready_channels_;
175 174
176 private: 175 private:
177 DISALLOW_COPY_AND_ASSIGN(ConnectionToHost); 176 DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
178 }; 177 };
179 178
180 } // namespace protocol 179 } // namespace protocol
181 } // namespace remoting 180 } // namespace remoting
182 181
183 #endif // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_ 182 #endif // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
OLDNEW
« no previous file with comments | « remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java ('k') | remoting/protocol/errors.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698