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

Side by Side Diff: remoting/client/ios/bridge/client_instance.h

Issue 2753963002: Refactoring and rewriting the chromoting jni instance to be chromoting session. (Closed)
Patch Set: Fixed feedback. Created 3 years, 8 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_CLIENT_IOS_BRIDGE_CLIENT_INSTANCE_H_ 5 #ifndef REMOTING_CLIENT_IOS_BRIDGE_CLIENT_INSTANCE_H_
6 #define REMOTING_CLIENT_IOS_BRIDGE_CLIENT_INSTANCE_H_ 6 #define REMOTING_CLIENT_IOS_BRIDGE_CLIENT_INSTANCE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 18 matching lines...) Expand all
29 #include "remoting/protocol/performance_tracker.h" 29 #include "remoting/protocol/performance_tracker.h"
30 #include "remoting/protocol/transport_context.h" 30 #include "remoting/protocol/transport_context.h"
31 #include "remoting/signaling/xmpp_signal_strategy.h" 31 #include "remoting/signaling/xmpp_signal_strategy.h"
32 32
33 //#include "remoting/client/ios/audio_player_ios.h" 33 //#include "remoting/client/ios/audio_player_ios.h"
34 34
35 namespace remoting { 35 namespace remoting {
36 36
37 // class AudioPlayerIos; 37 // class AudioPlayerIos;
38 class ClientProxy; 38 class ClientProxy;
39 class ClientStatusLogger; 39 // class ClientStatusLogger;
Lambros 2017/04/05 01:31:19 Remove this instead of commenting out.
nicholss 2017/04/05 17:24:26 Acknowledged, but not going to change this file. T
40 class FrameConsumerBridge; 40 class FrameConsumerBridge;
41 41
42 // ClientUserInterface that indirectly makes and receives OBJ_C calls from the 42 // TODO(nicholss): Delete this Class. It needs to use the client version of
43 // UI application. 43 // ClientInstance. ClientUserInterface that indirectly makes and receives OBJ_C
Lambros 2017/04/05 01:31:19 Grammar of final sentence?
nicholss 2017/04/05 17:24:26 Acknowledged. See above.
44 // calls from the UI application.
44 class ClientInstance : public ClientUserInterface, 45 class ClientInstance : public ClientUserInterface,
45 public protocol::ClipboardStub, 46 public protocol::ClipboardStub,
46 public protocol::CursorShapeStub, 47 public protocol::CursorShapeStub,
47 public base::RefCountedThreadSafe<ClientInstance> { 48 public base::RefCountedThreadSafe<ClientInstance> {
48 public: 49 public:
49 // Initiates a connection with the specified host. Call from the UI thread. To 50 // Initiates a connection with the specified host. Call from the UI thread. To
50 // connect with an unpaired host, pass in |pairing_id| and |pairing_secret| as 51 // connect with an unpaired host, pass in |pairing_id| and |pairing_secret| as
51 // empty strings. 52 // empty strings.
52 ClientInstance(const base::WeakPtr<ClientProxy>& proxy, 53 ClientInstance(const base::WeakPtr<ClientProxy>& proxy,
53 const std::string& username, 54 const std::string& username,
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 // This group of variables is to be used on the display thread. 152 // This group of variables is to be used on the display thread.
152 std::unique_ptr<SoftwareVideoRenderer> video_renderer_; 153 std::unique_ptr<SoftwareVideoRenderer> video_renderer_;
153 std::unique_ptr<FrameConsumerBridge> view_; 154 std::unique_ptr<FrameConsumerBridge> view_;
154 155
155 // This group of variables is to be used on the network thread. 156 // This group of variables is to be used on the network thread.
156 std::unique_ptr<ClientContext> client_context_; 157 std::unique_ptr<ClientContext> client_context_;
157 std::unique_ptr<protocol::PerformanceTracker> perf_tracker_; 158 std::unique_ptr<protocol::PerformanceTracker> perf_tracker_;
158 std::unique_ptr<ChromotingClient> client_; 159 std::unique_ptr<ChromotingClient> client_;
159 XmppSignalStrategy::XmppServerConfig xmpp_config_; 160 XmppSignalStrategy::XmppServerConfig xmpp_config_;
160 std::unique_ptr<XmppSignalStrategy> signaling_; // Must outlive client_ 161 std::unique_ptr<XmppSignalStrategy> signaling_; // Must outlive client_
161 std::unique_ptr<ClientStatusLogger> client_status_logger_; 162
163 // TODO(nicholss): Migrate to ClientTelemetryLogger
164 // std::unique_ptr<ClientStatusLogger> client_status_logger_;
Lambros 2017/04/05 01:31:19 This is commented out, so remove both lines?
nicholss 2017/04/05 17:24:26 Acknowledged. See above.
162 165
163 // This group of variables is to be used on the audio thread. 166 // This group of variables is to be used on the audio thread.
164 // std::unique_ptr<AudioPlayerIos> audio_player_; 167 // std::unique_ptr<AudioPlayerIos> audio_player_;
165 168
166 // Pass this the user's PIN once we have it. To be assigned and accessed on 169 // Pass this the user's PIN once we have it. To be assigned and accessed on
167 // the UI thread, but must be posted to the network thread to call it. 170 // the UI thread, but must be posted to the network thread to call it.
168 protocol::SecretFetchedCallback pin_callback_; 171 protocol::SecretFetchedCallback pin_callback_;
169 172
170 // Indicates whether to establish a new pairing with this host. This is 173 // Indicates whether to establish a new pairing with this host. This is
171 // modified in ProvideSecret(), but thereafter to be used only from the 174 // modified in ProvideSecret(), but thereafter to be used only from the
(...skipping 20 matching lines...) Expand all
192 scoped_refptr<net::URLRequestContextGetter> url_requester_; 195 scoped_refptr<net::URLRequestContextGetter> url_requester_;
193 196
194 friend class base::RefCountedThreadSafe<ClientInstance>; 197 friend class base::RefCountedThreadSafe<ClientInstance>;
195 198
196 DISALLOW_COPY_AND_ASSIGN(ClientInstance); 199 DISALLOW_COPY_AND_ASSIGN(ClientInstance);
197 }; 200 };
198 201
199 } // namespace remoting 202 } // namespace remoting
200 203
201 #endif // REMOTING_CLIENT_IOS_BRIDGE_CLIENT_INSTANCE_H_ 204 #endif // REMOTING_CLIENT_IOS_BRIDGE_CLIENT_INSTANCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698