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

Unified Diff: blimp/client/core/blimp_client_context_impl.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/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 289602adc22ae098e17f0cd8f963513e88c38b07..01d334daf7088af956a8a96a1125a77c6c73b996 100644
--- a/blimp/client/core/blimp_client_context_impl.cc
+++ b/blimp/client/core/blimp_client_context_impl.cc
@@ -5,6 +5,7 @@
#include "blimp/client/core/blimp_client_context_impl.h"
#include "base/bind.h"
+#include "base/lazy_instance.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/threading/sequenced_task_runner_handle.h"
@@ -23,6 +24,9 @@ namespace client {
namespace {
const char kDefaultAssignerUrl[] =
"https://blimp-pa.googleapis.com/v1/assignment";
+
+// This should go elsewhere when we start setting up the feature code.
+base::LazyInstance<RenderWidgetFeature> g_render_widget_feature;
} // namespace
// This function is declared in //blimp/client/public/blimp_client_context.h,
@@ -48,7 +52,8 @@ BlimpClientContextImpl::BlimpClientContextImpl(
: BlimpClientContext(),
io_thread_task_runner_(io_thread_task_runner),
file_thread_task_runner_(file_thread_task_runner),
- blimp_contents_manager_(new BlimpContentsManager),
+ blimp_contents_manager_(
+ new BlimpContentsManager(true, g_render_widget_feature.Pointer())),
weak_factory_(this) {
blimp_connection_statistics_ = new BlimpConnectionStatistics();
net_components_.reset(new ClientNetworkComponents(

Powered by Google App Engine
This is Rietveld 408576698