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

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

Issue 2463423002: Add Settings[, Oberser] java code and JNI bridge. (Closed)
Patch Set: 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 81769e53483afa6bf70bf0211f742a2be050e0bc..4e5b1941c4d7eb510759ba2cef098fcbfa79543a 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 {
@@ -101,7 +102,11 @@ BlimpClientContextImpl::BlimpClientContextImpl(
blimp_compositor_dependencies_(
base::MakeUnique<BlimpCompositorDependencies>(
std::move(compositor_dependencies))),
+#if defined(OS_ANDROID)
David Trainor- moved to gerrit 2016/11/03 03:05:10 Can we pass the settings object in the constructor
Menglin 2016/11/03 23:17:01 yes we can do that to avoid #if in the constructor
+ settings_(base::MakeUnique<SettingsAndroid>(local_state)),
+#else
settings_(base::MakeUnique<Settings>(local_state)),
+#endif
blob_channel_feature_(new BlobChannelFeature(this)),
geolocation_feature_(base::MakeUnique<GeolocationFeature>(
base::MakeUnique<device::LocationArbitrator>(

Powered by Google App Engine
This is Rietveld 408576698