Hooks together Geolocation Feature in the Client and Engine.

blimp/client/core/blimp_client_context_impl.h

 // 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.
 
 #ifndef BLIMP_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_
 #define BLIMP_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_
 
 #include <memory>
+#include <string>

[nyquist, 2016/09/01 00:34:30]

thanks!

 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "blimp/client/core/session/client_network_components.h"
 #include "blimp/client/core/session/identity_source.h"
 #include "blimp/client/core/session/network_event_observer.h"
 #include "blimp/client/public/blimp_client_context.h"
 #include "blimp/client/public/contents/blimp_contents.h"
 #include "blimp/client/public/session/assignment.h"
 #include "blimp/net/thread_pipe_manager.h"
+#include "device/geolocation/geolocation_delegate.h"

[nyquist, 2016/09/01 00:34:30]

can this be forward declared?

[CJ, 2016/09/01 00:45:40]

Done.

 #include "url/gurl.h"
 
 namespace blimp {
 namespace client {
 
 class BlimpCompositorDependencies;
 class BlimpContentsManager;
 class CompositorDependencies;
+class GeolocationFeature;
 class ImeFeature;
 class NavigationFeature;
 class RenderWidgetFeature;
 class SettingsFeature;
 class TabControlFeature;
 
 // BlimpClientContextImpl is the implementation of the main context-class for
 // the blimp client.
 class BlimpClientContextImpl : public BlimpClientContext,
                                public NetworkEventObserver {
@@ skipping 52 matching lines @@
   // The task runner to use for file operations.
   scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner_;
 
   // The AssignmentSource is used when the user of BlimpClientContextImpl calls
   // Connect() to get a valid assignment and later connect to the engine.
   std::unique_ptr<AssignmentSource> assignment_source_;
 
   // A set of dependencies required by all BlimpCompositor instances.
   std::unique_ptr<BlimpCompositorDependencies> blimp_compositor_dependencies_;
 
+  std::unique_ptr<device::GeolocationDelegate> geolocation_delegate_;

[nyquist, 2016/09/01 00:34:30]

Could you have a quick comment here as to what this delegate is for?

[CJ, 2016/09/01 00:45:40]

Done.

+
   // Features to handle all incoming and outgoing protobuf messages.
+  std::unique_ptr<GeolocationFeature> geolocation_feature_;
   std::unique_ptr<ImeFeature> ime_feature_;
   std::unique_ptr<NavigationFeature> navigation_feature_;
   std::unique_ptr<RenderWidgetFeature> render_widget_feature_;
   std::unique_ptr<SettingsFeature> settings_feature_;
   std::unique_ptr<TabControlFeature> tab_control_feature_;
 
   std::unique_ptr<BlimpContentsManager> blimp_contents_manager_;
 
   // Container struct for network components.
   // Must be deleted on the IO thread.
   std::unique_ptr<ClientNetworkComponents> net_components_;
 
   std::unique_ptr<ThreadPipeManager> thread_pipe_manager_;
 
   // Provide OAuth2 token and propagate account sign in states change.
   std::unique_ptr<IdentitySource> identity_source_;
 
   base::WeakPtrFactory<BlimpClientContextImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpClientContextImpl);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_