Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_JNI_CHROMOTING_JNI_RUNTIME_H_ | 5 #ifndef REMOTING_CLIENT_JNI_CHROMOTING_JNI_RUNTIME_H_ |
| 6 #define REMOTING_CLIENT_JNI_CHROMOTING_JNI_RUNTIME_H_ | 6 #define REMOTING_CLIENT_JNI_CHROMOTING_JNI_RUNTIME_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 89 // Updates video frame bitmap. |bitmap| must be an instance of | 89 // Updates video frame bitmap. |bitmap| must be an instance of |
| 90 // android.graphics.Bitmap. Call on the display thread. | 90 // android.graphics.Bitmap. Call on the display thread. |
| 91 void UpdateFrameBitmap(jobject bitmap); | 91 void UpdateFrameBitmap(jobject bitmap); |
| 92 | 92 |
| 93 // Updates cursor shape. Call on display thread. | 93 // Updates cursor shape. Call on display thread. |
| 94 void UpdateCursorShape(const protocol::CursorShapeInfo& cursor_shape); | 94 void UpdateCursorShape(const protocol::CursorShapeInfo& cursor_shape); |
| 95 | 95 |
| 96 // Draws the latest image buffer onto the canvas. Call on the display thread. | 96 // Draws the latest image buffer onto the canvas. Call on the display thread. |
| 97 void RedrawCanvas(); | 97 void RedrawCanvas(); |
| 98 | 98 |
| 99 // Pops up a third party login page to fetch token required for | |
| 100 // authentication. | |
|
Lambros
2014/06/07 01:38:12
Add "Call on UI thread."
I think these methods are
kelvinp
2014/06/09 18:42:32
Done.
| |
| 101 void FetchThirdPartyToken(const GURL& token_url, | |
| 102 const std::string& client_id, | |
| 103 const std::string& scope); | |
|
Lambros
2014/06/07 01:38:12
Same here. Make sure the ordering of methods in .c
kelvinp
2014/06/09 18:42:32
Done.
| |
| 104 | |
| 99 private: | 105 private: |
| 100 ChromotingJniRuntime(); | 106 ChromotingJniRuntime(); |
| 101 | 107 |
| 102 // Forces a DisconnectFromHost() in case there is any active or failed | 108 // Forces a DisconnectFromHost() in case there is any active or failed |
| 103 // connection, then proceeds to tear down the Chromium dependencies on which | 109 // connection, then proceeds to tear down the Chromium dependencies on which |
| 104 // all sessions depended. Because destruction only occurs at application exit | 110 // all sessions depended. Because destruction only occurs at application exit |
| 105 // after all connections have terminated, it is safe to make unretained | 111 // after all connections have terminated, it is safe to make unretained |
| 106 // cross-thread calls on the class. | 112 // cross-thread calls on the class. |
| 107 virtual ~ChromotingJniRuntime(); | 113 virtual ~ChromotingJniRuntime(); |
| 108 | 114 |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 127 scoped_refptr<ChromotingJniInstance> session_; | 133 scoped_refptr<ChromotingJniInstance> session_; |
| 128 | 134 |
| 129 friend struct DefaultSingletonTraits<ChromotingJniRuntime>; | 135 friend struct DefaultSingletonTraits<ChromotingJniRuntime>; |
| 130 | 136 |
| 131 DISALLOW_COPY_AND_ASSIGN(ChromotingJniRuntime); | 137 DISALLOW_COPY_AND_ASSIGN(ChromotingJniRuntime); |
| 132 }; | 138 }; |
| 133 | 139 |
| 134 } // namespace remoting | 140 } // namespace remoting |
| 135 | 141 |
| 136 #endif | 142 #endif |
| OLD | NEW |