Blimp Settings framework on the c++ side

blimp/client/core/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/blimp_client_context_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "blimp/client/core/blimp_client_switches.h"
 #include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
 #include "blimp/client/core/compositor/blob_channel_feature.h"
 #include "blimp/client/core/contents/blimp_contents_impl.h"
 #include "blimp/client/core/contents/blimp_contents_manager.h"
 #include "blimp/client/core/contents/ime_feature.h"
 #include "blimp/client/core/contents/navigation_feature.h"
 #include "blimp/client/core/contents/tab_control_feature.h"
 #include "blimp/client/core/feedback/blimp_feedback_data.h"
 #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"
 
 #if defined(OS_ANDROID)
 #include "blimp/client/core/android/blimp_client_context_impl_android.h"
 #endif  // OS_ANDROID
 
 namespace blimp {
 namespace client {
@@ skipping 10 matching lines @@
 }  // namespace
 
 // 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::Create.
 // static
 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>(
               base::MakeUnique<device::GeolocationDelegate>()))),
       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(),
                                    ime_feature_.get(),
                                    navigation_feature_.get(),
                                    render_widget_feature_.get(),
                                    tab_control_feature_.get())),
       weak_factory_(this) {
   net_components_.reset(new ClientNetworkComponents(
       base::MakeUnique<CrossThreadNetworkEventObserver>(
           connection_status_.GetWeakPtr(),
           base::SequencedTaskRunnerHandle::Get())));
 
   // The |thread_pipe_manager_| must be set up correctly before features are
   // registered.
   thread_pipe_manager_ = base::MakeUnique<ThreadPipeManager>(
       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.
   io_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&ClientNetworkComponents::Initialize,
                             base::Unretained(net_components_.get())));
 
   UMA_HISTOGRAM_BOOLEAN("Blimp.Supported", true);
 }
 
@@ skipping 105 matching lines @@
   thread_pipe_manager_->RegisterFeature(BlimpMessage::kRenderWidget,
                                         render_widget_feature_.get());
   settings_feature_->set_outgoing_message_processor(
       thread_pipe_manager_->RegisterFeature(BlimpMessage::kSettings,
                                             settings_feature_.get()));
   tab_control_feature_->set_outgoing_message_processor(
       thread_pipe_manager_->RegisterFeature(BlimpMessage::kTabControl,
                                             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()));
 }
 
 void BlimpClientContextImpl::CreateIdentitySource() {
   identity_source_ = base::MakeUnique<IdentitySource>(
       delegate_, base::Bind(&BlimpClientContextImpl::OnAuthTokenReceived,
                             base::Unretained(this)));
 }
 
 void BlimpClientContextImpl::OnImageDecodeError() {
   // Currently we just drop the connection on image decoding error.
   DropConnection();
 }
 
 }  // namespace client
 }  // namespace blimp