Blimp Settings framework on the c++ side

blimp/client/core/blimp_client_context_impl.cc

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 4bd2af09b6811ce5ae26e9b8333414cf35cb556c..bef1ddcac003cd5250301dd15191a826b3e29a5a 100644
--- a/blimp/client/core/blimp_client_context_impl.cc
+++ b/blimp/client/core/blimp_client_context_impl.cc
@@ -24,9 +24,11 @@
 #include "blimp/client/core/geolocation/geolocation_feature.h"
 #include "blimp/client/core/render_widget/render_widget_feature.h"
 #include "blimp/client/core/session/cross_thread_network_event_observer.h"
+#include "blimp/client/core/settings/settings.h"
 #include "blimp/client/core/settings/settings_feature.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"
@@ -57,28 +59,42 @@ void DropConnectionOnIOThread(ClientNetworkComponents* net_components) {
 BlimpClientContext* BlimpClientContext::Create(
     scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
-    std::unique_ptr<CompositorDependencies> compositor_dependencies) {
+    std::unique_ptr<CompositorDependencies> compositor_dependencies,
+    PrefService* local_state) {
 #if defined(OS_ANDROID)
   return new BlimpClientContextImplAndroid(io_thread_task_runner,
                                            file_thread_task_runner,
-                                           std::move(compositor_dependencies));
+                                           std::move(compositor_dependencies),
+                                           local_state);
 #else
   return new BlimpClientContextImpl(io_thread_task_runner,
                                     file_thread_task_runner,
-                                    std::move(compositor_dependencies));
+                                    std::move(compositor_dependencies),
+                                    local_state);
 #endif  // defined(OS_ANDROID)
 }
 
+// This function is declared in //blimp/client/public/blimp_client_context.h
+// and either this function or the one in
+// //blimp/client/core/dummy_blimp_client_context.cc should be linked in to
+// any binary using BlimpClientContext::RegisterPrefs.
+// static
+void BlimpClientContext::RegisterPrefs(PrefRegistrySimple* registry) {
+  Settings::RegisterPrefs(registry);
+}
+
 BlimpClientContextImpl::BlimpClientContextImpl(
     scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
-    std::unique_ptr<CompositorDependencies> compositor_dependencies)
+    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))),
+      settings_(new Settings(local_state)),

[David Trainor- moved to gerrit, 2016/10/01 03:26:34]

base::MakeUnique

[Menglin, 2016/10/03 23:08:26]

Done.

       blob_channel_feature_(new BlobChannelFeature(this)),
       geolocation_feature_(base::MakeUnique<GeolocationFeature>(
           base::MakeUnique<device::LocationArbitrator>(
@@ -86,7 +102,7 @@ BlimpClientContextImpl::BlimpClientContextImpl(
       ime_feature_(new ImeFeature),
       navigation_feature_(new NavigationFeature),
       render_widget_feature_(new RenderWidgetFeature),
-      settings_feature_(new SettingsFeature),
+      settings_feature_(new SettingsFeature(settings_.get())),

[David Trainor- moved to gerrit, 2016/10/01 03:26:34]

base::MakeUnique

[Menglin, 2016/10/03 23:08:26]

Done.

       tab_control_feature_(new TabControlFeature),
       blimp_contents_manager_(
           new BlimpContentsManager(blimp_compositor_dependencies_.get(),
@@ -106,7 +122,7 @@ BlimpClientContextImpl::BlimpClientContextImpl(
       io_thread_task_runner_, net_components_->GetBrowserConnectionHandler());
 
   RegisterFeatures();
-  InitializeSettings();
+  settings_feature_->PushSettings();

[David Trainor- moved to gerrit, 2016/10/01 03:26:34]

I wonder if this would make more sense being done after OnConnected?  I assume
this just queues up the message to be sent once we're connected now though.  If
that's the case I'm fine with it for now.

[Menglin, 2016/10/03 23:08:26]

Yeah this just just queues up the message until connected.

 
   // Initialize must only be posted after the features have been
   // registered.
@@ -232,12 +248,6 @@ void BlimpClientContextImpl::RegisterFeatures() {
                                             tab_control_feature_.get()));
 }
 
-void BlimpClientContextImpl::InitializeSettings() {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDownloadWholeDocument))
-    settings_feature_->SetRecordWholeDocument(true);
-}
-
 void BlimpClientContextImpl::DropConnection() {
   io_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&DropConnectionOnIOThread, net_components_.get()));