Blimp Settings framework on the c++ side

blimp/client/core/dummy_blimp_client_context.cc

Index: blimp/client/core/dummy_blimp_client_context.cc
diff --git a/blimp/client/core/dummy_blimp_client_context.cc b/blimp/client/core/dummy_blimp_client_context.cc
index 45a4ef4f958a38f10b0dc3d650c0549aaca645e1..f750081815905a8d572126ec96a69c94e06eb050 100644
--- a/blimp/client/core/dummy_blimp_client_context.cc
+++ b/blimp/client/core/dummy_blimp_client_context.cc
@@ -25,7 +25,8 @@ namespace client {
 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 DummyBlimpClientContextAndroid();
 #else
@@ -33,6 +34,13 @@ BlimpClientContext* BlimpClientContext::Create(
 #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/blimp_client_context_impl.cc should be linked in to
+// any binary using BlimpClientContext::RegisterPrefs.
+// static
+void BlimpClientContext::RegisterPrefs(PrefRegistrySimple* registry) {}
+
 DummyBlimpClientContext::DummyBlimpClientContext() : BlimpClientContext() {
   UMA_HISTOGRAM_BOOLEAN("Blimp.Supported", false);
 }