Chromium Code Reviews| 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>( |