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

Unified Diff: blimp/client/core/android/blimp_client_context_impl_android.cc

Issue 2292723003: Move remaining Blimp feature code to core. (Closed)
Patch Set: Fix build break 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/android/blimp_client_context_impl_android.cc
diff --git a/blimp/client/core/android/blimp_client_context_impl_android.cc b/blimp/client/core/android/blimp_client_context_impl_android.cc
index 23e078ecf8cb74614d7e7eb06d3b4820f8da1161..6ef38658c90cadd997b72c316c9773e458f8475d 100644
--- a/blimp/client/core/android/blimp_client_context_impl_android.cc
+++ b/blimp/client/core/android/blimp_client_context_impl_android.cc
@@ -10,6 +10,7 @@
#include "blimp/client/core/contents/blimp_contents_impl.h"
#include "blimp/client/core/settings/android/blimp_settings_android.h"
#include "blimp/client/public/blimp_client_context.h"
+#include "blimp/client/public/compositor/compositor_dependencies.h"
#include "jni/BlimpClientContextImpl_jni.h"
namespace blimp {
@@ -42,8 +43,11 @@ base::android::ScopedJavaLocalRef<jobject> BlimpClientContext::GetJavaObject(
BlimpClientContextImplAndroid::BlimpClientContextImplAndroid(
scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner)
- : BlimpClientContextImpl(io_thread_task_runner, file_thread_task_runner) {
+ scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
+ std::unique_ptr<CompositorDependencies> compositor_dependencies)
+ : BlimpClientContextImpl(io_thread_task_runner,
+ file_thread_task_runner,
+ std::move(compositor_dependencies)) {
JNIEnv* env = base::android::AttachCurrentThread();
java_obj_.Reset(env, Java_BlimpClientContextImpl_create(
« no previous file with comments | « blimp/client/core/android/blimp_client_context_impl_android.h ('k') | blimp/client/core/blimp_client_context_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698