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

Unified Diff: blimp/client/core/blimp_client_context_impl.cc

Issue 2297933002: blimp: Set up the CompositorDependencies for blimp in Chrome. (Closed)
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/blimp_client_context_impl.cc
diff --git a/blimp/client/core/blimp_client_context_impl.cc b/blimp/client/core/blimp_client_context_impl.cc
index 4ebebde648c30cfb8a3c03536604343eb4b982d8..367ccd7aa3545ac0c31159b62acbef1bc995b827 100644
--- a/blimp/client/core/blimp_client_context_impl.cc
+++ b/blimp/client/core/blimp_client_context_impl.cc
@@ -8,6 +8,7 @@
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/threading/sequenced_task_runner_handle.h"
+#include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
#include "blimp/client/core/contents/blimp_contents_impl.h"
#include "blimp/client/core/contents/blimp_contents_manager.h"
#include "blimp/client/core/contents/ime_feature.h"
@@ -15,6 +16,7 @@
#include "blimp/client/core/contents/tab_control_feature.h"
#include "blimp/client/core/session/cross_thread_network_event_observer.h"
#include "blimp/client/public/blimp_client_context_delegate.h"
+#include "blimp/client/public/compositor/compositor_dependencies.h"
#if defined(OS_ANDROID)
#include "blimp/client/core/android/blimp_client_context_impl_android.h"
@@ -35,22 +37,29 @@ const char kDefaultAssignerUrl[] =
// static
BlimpClientContext* BlimpClientContext::Create(
scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner) {
+ scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
+ std::unique_ptr<CompositorDependencies> compositor_dependencies) {
#if defined(OS_ANDROID)
return new BlimpClientContextImplAndroid(io_thread_task_runner,
- file_thread_task_runner);
+ file_thread_task_runner,
+ std::move(compositor_dependencies));
#else
return new BlimpClientContextImpl(io_thread_task_runner,
- file_thread_task_runner);
+ file_thread_task_runner,
+ std::move(compositor_dependencies));
#endif // defined(OS_ANDROID)
}
BlimpClientContextImpl::BlimpClientContextImpl(
scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner)
+ scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
+ std::unique_ptr<CompositorDependencies> compositor_dependencies)
: BlimpClientContext(),
io_thread_task_runner_(io_thread_task_runner),
file_thread_task_runner_(file_thread_task_runner),
+ blimp_compositor_dependencies_(
+ base::MakeUnique<BlimpCompositorDependencies>(
+ std::move(compositor_dependencies))),
ime_feature_(new ImeFeature),
navigation_feature_(new NavigationFeature),
tab_control_feature_(new TabControlFeature),

Powered by Google App Engine
This is Rietveld 408576698