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

Unified Diff: remoting/client/jni/chromoting_jni_instance.h

Issue 19297003: Add support for drawing video onto a Java ByteBuffer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix crashes discovered during integration testing Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: remoting/client/jni/chromoting_jni_instance.h
diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
index c9e689a4116e09aac179d713530b6ea48350965b..2374e24e7d1b1ba92f1ccc001ead0df4ead5434c 100644
--- a/remoting/client/jni/chromoting_jni_instance.h
+++ b/remoting/client/jni/chromoting_jni_instance.h
@@ -9,18 +9,19 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "remoting/client/chromoting_client.h"
#include "remoting/client/client_config.h"
#include "remoting/client/client_context.h"
#include "remoting/client/client_user_interface.h"
#include "remoting/client/frame_consumer_proxy.h"
+#include "remoting/client/jni/jni_frame_consumer.h"
#include "remoting/jingle_glue/network_settings.h"
#include "remoting/jingle_glue/xmpp_signal_strategy.h"
#include "remoting/protocol/connection_to_host.h"
namespace remoting {
-class ChromotingJni;
// ClientUserInterface that indirectly makes and receives JNI calls.
class ChromotingJniInstance
@@ -44,6 +45,9 @@ class ChromotingJniInstance
// but only after the UI has been asked to provide a PIN (via FetchSecret()).
void ProvideSecret(const char* pin);
+ // Schedules a redraw on the display thread. May be called from any thread.
+ void RedrawDesktop();
+
// ClientUserInterface implementation.
virtual void OnConnectionState(
protocol::ConnectionToHost::State state,
@@ -63,13 +67,18 @@ class ChromotingJniInstance
void ConnectToHostOnDisplayThread();
void ConnectToHostOnNetworkThread();
+ void DisconnectFromHostOnNetworkThread();
// Notifies the user interface that the user needs to enter a PIN. The
// current authentication attempt is put on hold until |callback| is invoked.
+ // May be called on any thread.
void FetchSecret(bool pairable,
const protocol::SecretFetchedCallback& callback);
+ // This group of variables is to be used on the display thread.
scoped_refptr<FrameConsumerProxy> frame_consumer_;
+ scoped_ptr<JniFrameConsumer> view_;
+ scoped_ptr<base::WeakPtrFactory<JniFrameConsumer> > view_weak_factory_;
// This group of variables is to be used on the network thread.
scoped_ptr<ClientConfig> client_config_;

Powered by Google App Engine
This is Rietveld 408576698