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

Unified Diff: blimp/client/core/contents/android/blimp_view.h

Issue 2320923002: Add a full Blimp integration test. (Closed)
Patch Set: Fixed this a bit more. Still some thread violations :(. Created 4 years, 3 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: blimp/client/core/contents/android/blimp_view.h
diff --git a/blimp/client/core/contents/android/blimp_view.h b/blimp/client/core/contents/android/blimp_view.h
index 7df8be4eb28f0ac158500a724c9ef0bf611e048f..0301f21ef89730312f115e104f9adbe51752eaf0 100644
--- a/blimp/client/core/contents/android/blimp_view.h
+++ b/blimp/client/core/contents/android/blimp_view.h
@@ -10,10 +10,14 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
+namespace ui {
+class WindowAndroid;
+} // namespace ui
+
namespace blimp {
namespace client {
-class BlimpContentsImpl;
+class BlimpContentsViewImpl;
// The JNI bridge for the Java BlimpView that will provide hooks to the Android
// framework to interact with the content. The Java object is created by
@@ -22,9 +26,11 @@ class BlimpView {
public:
static bool RegisterJni(JNIEnv* env);
- // |blimp_contents_impl| must be the BlimpContentsImpl that this BlimpView is
- // used for.
- explicit BlimpView(BlimpContentsImpl* blimp_contents_impl);
+ // |blimp_contents_view| must be the BlimpContentsView that owns this
+ // BlimpView. |window| should also be the WindowAndroid that the
+ // corresponding BlimpContents was created with.
+ explicit BlimpView(ui::WindowAndroid* window,
+ BlimpContentsViewImpl* blimp_contents_view);
~BlimpView();
base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
@@ -70,9 +76,9 @@ class BlimpView {
jfloat device_scale_factor_dp_to_px);
private:
- // The BlimpContentsImpl that this BlimpView is used for.
+ // UPDATE COMMENT The BlimpContentsImpl that this BlimpView is used for.
Khushal 2016/09/13 04:47:24 That's a good idea. :P
David Trainor- moved to gerrit 2016/09/13 06:18:04 ;)
// TODO(nyquist): Use a delegate instead of the BlimpContentsImpl.
- BlimpContentsImpl* blimp_contents_impl_;
+ BlimpContentsViewImpl* blimp_contents_view_;
// The Java object for this BlimpView.
base::android::ScopedJavaGlobalRef<jobject> java_obj_;

Powered by Google App Engine
This is Rietveld 408576698