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

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

Issue 2463423002: Add Settings[, Oberser] java code and JNI bridge. (Closed)
Patch Set: lifetime of ObserverProxy.java and passing Settings object to BlimpClientContextImpl Created 4 years, 1 month 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/context/blimp_client_context_impl.cc
diff --git a/blimp/client/core/context/blimp_client_context_impl.cc b/blimp/client/core/context/blimp_client_context_impl.cc
index 7277f1ab6521bbcc13cd7e4189d3f7cfadf3c126..a17b24856a26f89e321de943adabf4e6318d4dc1 100644
--- a/blimp/client/core/context/blimp_client_context_impl.cc
+++ b/blimp/client/core/context/blimp_client_context_impl.cc
@@ -35,6 +35,7 @@
#if defined(OS_ANDROID)
#include "blimp/client/core/context/android/blimp_client_context_impl_android.h"
+#include "blimp/client/core/settings/android/settings_android.h"
#endif // OS_ANDROID
namespace blimp {
@@ -62,13 +63,15 @@ BlimpClientContext* BlimpClientContext::Create(
std::unique_ptr<CompositorDependencies> compositor_dependencies,
PrefService* local_state) {
#if defined(OS_ANDROID)
+ auto settings = base::MakeUnique<SettingsAndroid>(local_state);
David Trainor- moved to gerrit 2016/11/07 18:30:58 Maybe just inline this? I'm fine either way thoug
Menglin 2016/11/07 19:11:55 i'll just keep it this way then :)
return new BlimpClientContextImplAndroid(
io_thread_task_runner, file_thread_task_runner,
- std::move(compositor_dependencies), local_state);
+ std::move(compositor_dependencies), std::move(settings));
#else
+ auto settings = base::MakeUnique<Settings>(local_state);
return new BlimpClientContextImpl(
io_thread_task_runner, file_thread_task_runner,
- std::move(compositor_dependencies), local_state);
+ std::move(compositor_dependencies), std::move(settings));
#endif // defined(OS_ANDROID)
}
@@ -94,14 +97,14 @@ BlimpClientContextImpl::BlimpClientContextImpl(
scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
std::unique_ptr<CompositorDependencies> compositor_dependencies,
- PrefService* local_state)
+ std::unique_ptr<Settings> settings)
: 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))),
- settings_(base::MakeUnique<Settings>(local_state)),
+ settings_(std::move(settings)),
blob_channel_feature_(new BlobChannelFeature(this)),
geolocation_feature_(base::MakeUnique<GeolocationFeature>(
base::MakeUnique<device::LocationArbitrator>(

Powered by Google App Engine
This is Rietveld 408576698