Blimp Settings framework on the c++ side

blimp/client/app/linux/blimp_main.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 <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/app/blimp_startup.h"
 #include "blimp/client/app/linux/blimp_client_context_delegate_linux.h"
 #include "blimp/client/app/linux/blimp_display_manager.h"
 #include "blimp/client/app/linux/blimp_display_manager_delegate_main.h"
+#include "blimp/client/core/settings/settings_prefs.h"
 #include "blimp/client/public/blimp_client_context.h"
 #include "blimp/client/public/contents/blimp_navigation_controller.h"
 #include "blimp/client/support/compositor/compositor_dependencies_impl.h"
+#include "components/pref_registry/pref_registry_syncable.h"
+#include "components/prefs/pref_service.h"
+#include "components/prefs/pref_service_factory.h"
 #include "ui/gfx/x/x11_connection.h"
 
 namespace {
 const char kDefaultUrl[] = "https://www.google.com";
 constexpr int kWindowWidth = 800;
 constexpr int kWindowHeight = 600;
 }
 
 int main(int argc, const char**argv) {
   base::AtExitManager at_exit;
@@ skipping 11 matching lines @@
 
   // Creating this using "new" and passing to context using "WrapUnique" as
   // opposed to "MakeUnique" because we'll need to pass the compositor
   // dependencies to the display manager as well.
   blimp::client::CompositorDependencies* compositor_dependencies =
       new blimp::client::CompositorDependenciesImpl();
   // Creating the context delegate before the context so that the context is
   // destroyed before the delegate.
   std::unique_ptr<blimp::client::BlimpClientContextDelegate> context_delegate =
       base::MakeUnique<blimp::client::BlimpClientContextDelegateLinux>();
-  std::unique_ptr<blimp::client::BlimpClientContext> context =
-      base::WrapUnique<blimp::client::BlimpClientContext>(
-          blimp::client::BlimpClientContext::Create(
-              io_thread.task_runner(), io_thread.task_runner(),
-              base::WrapUnique(compositor_dependencies)));
+
+  scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry =

[David Trainor- moved to gerrit, 2016/10/26 07:00:25]

Shouldn't we do the following?

blimp::client::RegisterPrefs(...);
blimp::client::ApplyBlimpSwitches(...)?

[Menglin, 2016/10/26 19:28:33]

to do ApplyBlimpSwitches, i create a subclass of CommandLinePrefStore here (say
BlimpShellCommandLinePrefStore), because we can't use ChromeCommandLinePrefStore
here and we can't directly create a CommandLinePrefStore (the constructor is
protected). BlimpShellCommandLinePrefStore will have a public constructor and
just call blimp::client::BlimpClientContext::ApplyBlimpSwitches(this) in its
constructor

also, the pref_service_factory needs to set its user_prefs, otherwise it'll
crash. I set a InMemoryPrefStore because we just need something for the blimp
shell. (see the new patch)

+      new ::user_prefs::PrefRegistrySyncable();
+  pref_registry->RegisterBooleanPref(
+      blimp::client::prefs::kBlimpEnabled, false);
+  pref_registry->RegisterBooleanPref(
+      blimp::client::prefs::kRecordWholeDocument, false);
+
+  // Set up PrefService.
+  PrefServiceFactory pref_service_factory;
+  std::unique_ptr<PrefService> pref_service =
+      pref_service_factory.Create(pref_registry.get());
+
+  auto context = base::WrapUnique<blimp::client::BlimpClientContext>(
+      blimp::client::BlimpClientContext::Create(
+          io_thread.task_runner(), io_thread.task_runner(),
+          base::WrapUnique(compositor_dependencies),
+          pref_service.get()));
   context->SetDelegate(context_delegate.get());
 
   context->Connect();
 
   // If there is a non-switch argument to the command line, load that url.
   base::CommandLine::StringVector args =
       base::CommandLine::ForCurrentProcess()->GetArgs();
   std::string url = args.size() > 0 ? args[0] : kDefaultUrl;
   std::unique_ptr<blimp::client::BlimpContents> contents =
       context->CreateBlimpContents(nullptr);
   contents->GetNavigationController().LoadURL(GURL(url));
 
   std::unique_ptr<blimp::client::BlimpDisplayManagerDelegate>
       display_manager_delegate =
           base::MakeUnique<blimp::client::BlimpDisplayManagerDelegateMain>();
   blimp::client::BlimpDisplayManager display_manager(
       display_manager_delegate.get(), compositor_dependencies);
   display_manager.SetWindowSize(gfx::Size(kWindowWidth, kWindowHeight));
   display_manager.SetBlimpContents(std::move(contents));
 
   base::RunLoop().Run();
 }