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

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: addressed comments from #7 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 f90b1dc02b222929b3e0851a1a240809064d7aa0..8f303f9bd7c7c38dce6e686af9022ea5fa068a58 100644
--- a/blimp/client/core/blimp_client_context_impl.cc
+++ b/blimp/client/core/blimp_client_context_impl.cc
@@ -5,9 +5,12 @@
#include "blimp/client/core/blimp_client_context_impl.h"
#include "base/bind.h"
+#include "base/command_line.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"
+#include "blimp/client/core/blimp_client_switches.h"
#include "blimp/client/core/contents/blimp_contents_impl.h"
#include "blimp/client/core/contents/blimp_contents_manager.h"
#include "blimp/client/core/session/cross_thread_network_event_observer.h"
@@ -42,13 +45,27 @@ BlimpClientContext* BlimpClientContext::Create(
#endif // defined(OS_ANDROID)
}
+// static
+void BlimpClientContext::Initialize() {
+ CompositorDepsProvider::Initialize(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kUseInternalDisplay));
+}
+
+// static
+void BlimpClientContext::Terminate() {
+ CompositorDepsProvider::Terminate();
+}
+
BlimpClientContextImpl::BlimpClientContextImpl(
scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner)
: BlimpClientContext(),
io_thread_task_runner_(io_thread_task_runner),
file_thread_task_runner_(file_thread_task_runner),
- blimp_contents_manager_(new BlimpContentsManager),
+ render_widget_feature_(base::MakeUnique<RenderWidgetFeature>()),
+ blimp_contents_manager_(
+ new BlimpContentsManager(render_widget_feature_.get())),
weak_factory_(this) {
net_components_.reset(new ClientNetworkComponents(
base::MakeUnique<CrossThreadNetworkEventObserver>(

Powered by Google App Engine
This is Rietveld 408576698