Add Settings[, Oberser] java code and JNI bridge.

blimp/client/core/context/blimp_client_context_impl.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/client/core/context/blimp_client_context_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 17 matching lines @@
 #include "blimp/client/core/switches/blimp_client_switches.h"
 #include "blimp/client/public/blimp_client_context_delegate.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
 #include "components/prefs/pref_service.h"
 #include "device/geolocation/geolocation_delegate.h"
 #include "device/geolocation/location_arbitrator.h"
 #include "ui/gfx/native_widget_types.h"
 
 #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 {
 namespace client {
 
 namespace {
 
 const char kDefaultAssignerUrl[] =
     "https://blimp-pa.googleapis.com/v1/assignment";
 
@@ skipping 46 matching lines @@
     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)
     : 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))),
+#if defined(OS_ANDROID)

[David Trainor- moved to gerrit, 2016/11/03 03:05:10]

Can we pass the settings object in the constructor and just build it in the
create calls?  Then we don't have to pass local_state in.

[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>(
               base::MakeUnique<device::GeolocationDelegate>()))),
       ime_feature_(new ImeFeature),
       navigation_feature_(new NavigationFeature),
       render_widget_feature_(new RenderWidgetFeature),
       settings_feature_(base::MakeUnique<SettingsFeature>(settings_.get())),
       tab_control_feature_(new TabControlFeature),
       blimp_contents_manager_(
@@ skipping 154 matching lines @@
     if (result >= 0) {
       delegate_->OnEngineDisconnected(result);
     } else {
       delegate_->OnNetworkDisconnected(result);
     }
   }
 }
 
 }  // namespace client
 }  // namespace blimp