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

Unified Diff: blimp/client/core/contents/android/blimp_contents_factory.cc

Issue 2241623002: blimp: Move compositing, input and render widget feature to client/core. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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_contents_factory.cc
diff --git a/blimp/client/core/contents/android/blimp_contents_factory.cc b/blimp/client/core/contents/android/blimp_contents_factory.cc
index ae3df18b7b310c89c5232d1bd9f9efbbb8c73e19..d9be324a2a167da6596424fc57bcb2d3075c8b76 100644
--- a/blimp/client/core/contents/android/blimp_contents_factory.cc
+++ b/blimp/client/core/contents/android/blimp_contents_factory.cc
@@ -6,6 +6,8 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
+#include "base/lazy_instance.h"
+#include "blimp/client/core/compositor/compositor_deps_provider.h"
#include "blimp/client/core/contents/android/blimp_contents_impl_android.h"
#include "blimp/client/core/contents/blimp_contents_impl.h"
#include "jni/BlimpContentsFactory_jni.h"
@@ -24,7 +26,8 @@ static base::android::ScopedJavaLocalRef<jobject> CreateBlimpContents(
const JavaParamRef<jclass>& clazz) {
// To delete |blimp_contents_impl|, the Java caller must call the
// destroy() method on BlimpContents.
- BlimpContentsImpl* blimp_contents_impl = new BlimpContentsImpl(kDummyTabId);
+ BlimpContentsImpl* blimp_contents_impl =
+ new BlimpContentsImpl(kDummyTabId, nullptr, nullptr);
nyquist 2016/08/12 07:34:28 Dude, can we just delete this and the Java-class a
Khushal 2016/08/13 00:03:22 Done. But I can't get the JNI hookup for tests to
return blimp_contents_impl->GetJavaBlimpContentsImpl();
}

Powered by Google App Engine
This is Rietveld 408576698