Index: remoting/client/jni/chromoting_jni_instance.cc |
diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc |
index fcb4db332dbba13e7549317a654f05376da11889..ed7cee92cea9c9ab6b73ce57f966e0aa003fee6a 100644 |
--- a/remoting/client/jni/chromoting_jni_instance.cc |
+++ b/remoting/client/jni/chromoting_jni_instance.cc |
@@ -7,7 +7,7 @@ |
#include "base/bind.h" |
#include "base/logging.h" |
#include "remoting/client/audio_player.h" |
-#include "remoting/client/jni/chromoting_jni.h" |
+#include "remoting/client/jni/chromoting_jni_runtime.h" |
#include "remoting/protocol/libjingle_transport_factory.h" |
// TODO(solb) Move into location shared with client plugin. |
@@ -22,7 +22,7 @@ ChromotingJniInstance::ChromotingJniInstance(const char* username, |
const char* host_jid, |
const char* host_id, |
const char* host_pubkey) { |
- DCHECK(ChromotingJni::GetInstance()-> |
+ DCHECK(ChromotingJniRuntime::GetInstance()-> |
Wez
2013/07/23 19:59:07
This seems to be using the GetInstance() model, to
solb
2013/07/23 20:50:28
Done.
|
ui_task_runner()->BelongsToCurrentThread()); |
username_ = username; |
@@ -31,7 +31,7 @@ ChromotingJniInstance::ChromotingJniInstance(const char* username, |
host_id_ = host_id; |
host_pubkey_ = host_pubkey; |
- ChromotingJni::GetInstance()->display_task_runner()->PostTask( |
+ ChromotingJniRuntime::GetInstance()->display_task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&ChromotingJniInstance::ConnectToHostOnDisplayThread, |
this)); |
@@ -40,9 +40,9 @@ ChromotingJniInstance::ChromotingJniInstance(const char* username, |
ChromotingJniInstance::~ChromotingJniInstance() {} |
void ChromotingJniInstance::Cleanup() { |
- if (!ChromotingJni::GetInstance()-> |
+ if (!ChromotingJniRuntime::GetInstance()-> |
display_task_runner()->BelongsToCurrentThread()) { |
- ChromotingJni::GetInstance()->display_task_runner()->PostTask( |
+ ChromotingJniRuntime::GetInstance()->display_task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&ChromotingJniInstance::Cleanup, this)); |
return; |
@@ -54,32 +54,34 @@ void ChromotingJniInstance::Cleanup() { |
// The weak pointers must be invalidated on the same thread they were used. |
view_weak_factory_->InvalidateWeakPtrs(); |
- ChromotingJni::GetInstance()->network_task_runner()->PostTask(FROM_HERE, |
+ ChromotingJniRuntime::GetInstance()->network_task_runner()->PostTask( |
+ FROM_HERE, |
base::Bind(&ChromotingJniInstance::DisconnectFromHostOnNetworkThread, |
this)); |
} |
void ChromotingJniInstance::ProvideSecret(const char* pin) { |
- DCHECK(ChromotingJni::GetInstance()-> |
+ DCHECK(ChromotingJniRuntime::GetInstance()-> |
ui_task_runner()->BelongsToCurrentThread()); |
DCHECK(!pin_callback_.is_null()); |
// We invoke the string constructor to ensure |pin| gets copied *before* the |
// asynchronous run, since Java might want it back as soon as we return. |
- ChromotingJni::GetInstance()->network_task_runner()->PostTask(FROM_HERE, |
- base::Bind(pin_callback_, pin)); |
+ ChromotingJniRuntime::GetInstance()->network_task_runner()->PostTask( |
+ FROM_HERE, |
+ base::Bind(pin_callback_, pin)); |
} |
void ChromotingJniInstance::RedrawDesktop() { |
- if (!ChromotingJni::GetInstance()-> |
+ if (!ChromotingJniRuntime::GetInstance()-> |
display_task_runner()->BelongsToCurrentThread()) { |
- ChromotingJni::GetInstance()->display_task_runner()->PostTask( |
+ ChromotingJniRuntime::GetInstance()->display_task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&ChromotingJniInstance::RedrawDesktop, this)); |
return; |
} |
- ChromotingJni::GetInstance()->RedrawCanvas(); |
+ ChromotingJniRuntime::GetInstance()->RedrawCanvas(); |
} |
void ChromotingJniInstance::PerformMouseAction( |
@@ -87,9 +89,9 @@ void ChromotingJniInstance::PerformMouseAction( |
int y, |
protocol::MouseEvent_MouseButton button, |
bool buttonDown) { |
- if(!ChromotingJni::GetInstance()-> |
+ if(!ChromotingJniRuntime::GetInstance()-> |
network_task_runner()->BelongsToCurrentThread()) { |
- ChromotingJni::GetInstance()->network_task_runner()->PostTask( |
+ ChromotingJniRuntime::GetInstance()->network_task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&ChromotingJniInstance::PerformMouseAction, |
this, |
@@ -113,9 +115,9 @@ void ChromotingJniInstance::PerformMouseAction( |
void ChromotingJniInstance::OnConnectionState( |
protocol::ConnectionToHost::State state, |
protocol::ErrorCode error) { |
- if (!ChromotingJni::GetInstance()-> |
+ if (!ChromotingJniRuntime::GetInstance()-> |
ui_task_runner()->BelongsToCurrentThread()) { |
- ChromotingJni::GetInstance()-> |
+ ChromotingJniRuntime::GetInstance()-> |
ui_task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&ChromotingJniInstance::OnConnectionState, |
@@ -125,7 +127,7 @@ void ChromotingJniInstance::OnConnectionState( |
return; |
} |
- ChromotingJni::GetInstance()->ReportConnectionStatus(state, error); |
+ ChromotingJniRuntime::GetInstance()->ReportConnectionStatus(state, error); |
} |
void ChromotingJniInstance::OnConnectionReady(bool ready) { |
@@ -164,24 +166,24 @@ void ChromotingJniInstance::SetCursorShape( |
} |
void ChromotingJniInstance::ConnectToHostOnDisplayThread() { |
- DCHECK(ChromotingJni::GetInstance()-> |
+ DCHECK(ChromotingJniRuntime::GetInstance()-> |
display_task_runner()->BelongsToCurrentThread()); |
frame_consumer_ = new FrameConsumerProxy( |
- ChromotingJni::GetInstance()->display_task_runner()); |
- view_.reset(new JniFrameConsumer()); |
+ ChromotingJniRuntime::GetInstance()->display_task_runner()); |
+ view_.reset(new JniFrameConsumer(ChromotingJniRuntime::GetInstance())); |
view_weak_factory_.reset(new base::WeakPtrFactory<JniFrameConsumer>( |
view_.get())); |
frame_consumer_->Attach(view_weak_factory_->GetWeakPtr()); |
- ChromotingJni::GetInstance()->network_task_runner()->PostTask( |
+ ChromotingJniRuntime::GetInstance()->network_task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&ChromotingJniInstance::ConnectToHostOnNetworkThread, |
this)); |
} |
void ChromotingJniInstance::ConnectToHostOnNetworkThread() { |
- DCHECK(ChromotingJni::GetInstance()-> |
+ DCHECK(ChromotingJniRuntime::GetInstance()-> |
network_task_runner()->BelongsToCurrentThread()); |
client_config_.reset(new ClientConfig()); |
@@ -199,7 +201,7 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { |
protocol::AuthenticationMethod::FromString("spake2_plain")); |
client_context_.reset(new ClientContext( |
- ChromotingJni::GetInstance()->network_task_runner().get())); |
+ ChromotingJniRuntime::GetInstance()->network_task_runner().get())); |
client_context_->Start(); |
connection_.reset(new protocol::ConnectionToHost(true)); |
@@ -219,7 +221,7 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { |
signaling_config_->use_tls = CHAT_USE_TLS; |
signaling_.reset(new XmppSignalStrategy( |
- ChromotingJni::GetInstance()->url_requester(), |
+ ChromotingJniRuntime::GetInstance()->url_requester(), |
username_, |
auth_token_, |
"oauth2", |
@@ -230,13 +232,13 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { |
scoped_ptr<protocol::TransportFactory> fact( |
protocol::LibjingleTransportFactory::Create( |
*network_settings_, |
- ChromotingJni::GetInstance()->url_requester())); |
+ ChromotingJniRuntime::GetInstance()->url_requester())); |
client_->Start(signaling_.get(), fact.Pass()); |
} |
void ChromotingJniInstance::DisconnectFromHostOnNetworkThread() { |
- DCHECK(ChromotingJni::GetInstance()-> |
+ DCHECK(ChromotingJniRuntime::GetInstance()-> |
network_task_runner()->BelongsToCurrentThread()); |
username_ = ""; |
@@ -253,9 +255,9 @@ void ChromotingJniInstance::DisconnectFromHostOnNetworkThread() { |
void ChromotingJniInstance::FetchSecret( |
bool pairable, |
const protocol::SecretFetchedCallback& callback) { |
- if (!ChromotingJni::GetInstance()-> |
+ if (!ChromotingJniRuntime::GetInstance()-> |
ui_task_runner()->BelongsToCurrentThread()) { |
- ChromotingJni::GetInstance()->ui_task_runner()->PostTask( |
+ ChromotingJniRuntime::GetInstance()->ui_task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&ChromotingJniInstance::FetchSecret, |
this, |
@@ -265,7 +267,7 @@ void ChromotingJniInstance::FetchSecret( |
} |
pin_callback_ = callback; |
- ChromotingJni::GetInstance()->DisplayAuthenticationPrompt(); |
+ ChromotingJniRuntime::GetInstance()->DisplayAuthenticationPrompt(); |
} |
} // namespace remoting |