Hooks together Geolocation Feature in the Client and Engine.

blimp/client/core/blimp_client_context_impl.h

Index: blimp/client/core/blimp_client_context_impl.h
diff --git a/blimp/client/core/blimp_client_context_impl.h b/blimp/client/core/blimp_client_context_impl.h
index 355dddeb45fca4b5264b7aa2ddeb4f1d454cc0ee..c59c8c6f36632607ba3eee6a5878b6ac3dea3d72 100644
--- a/blimp/client/core/blimp_client_context_impl.h
+++ b/blimp/client/core/blimp_client_context_impl.h
@@ -6,6 +6,7 @@
 #define BLIMP_CLIENT_CORE_BLIMP_CLIENT_CONTEXT_IMPL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -19,14 +20,20 @@
 #include "blimp/client/public/contents/blimp_contents.h"
 #include "blimp/client/public/session/assignment.h"
 #include "blimp/net/thread_pipe_manager.h"
+

[Kevin M, 2016/09/01 20:01:06]

Remove this newline

[CJ, 2016/09/01 22:59:42]

Done.

 #include "url/gurl.h"
 
+namespace device {
+class GeolocationDelegate;
+}
+
 namespace blimp {
 namespace client {
 
 class BlimpCompositorDependencies;
 class BlimpContentsManager;
 class CompositorDependencies;
+class GeolocationFeature;
 class ImeFeature;
 class NavigationFeature;
 class RenderWidgetFeature;
@@ -99,7 +106,11 @@ class BlimpClientContextImpl : public BlimpClientContext,
   // A set of dependencies required by all BlimpCompositor instances.
   std::unique_ptr<BlimpCompositorDependencies> blimp_compositor_dependencies_;
 
+  // Provides embedder specific functionality for Geolocation.
+  std::unique_ptr<device::GeolocationDelegate> geolocation_delegate_;
+
   // 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_;