Java versions of BlimpContents[,Observer] and BlimpNavigationController

blimp/client/core/blimp_contents_impl.h

Index: blimp/client/core/blimp_contents_impl.h
diff --git a/blimp/client/core/blimp_contents_impl.h b/blimp/client/core/blimp_contents_impl.h
index 8710ab10a1e10f425c2b063783d53a20d6c6954c..077796e63f03f5973637d2c1b22b99a405f9922d 100644
--- a/blimp/client/core/blimp_contents_impl.h
+++ b/blimp/client/core/blimp_contents_impl.h
@@ -7,25 +7,40 @@
 
 #include "base/macros.h"
 #include "base/observer_list.h"
+#include "base/supports_user_data.h"
 #include "blimp/client/core/blimp_navigation_controller_delegate.h"
 #include "blimp/client/core/blimp_navigation_controller_impl.h"
 #include "blimp/client/core/public/blimp_contents.h"
 #include "url/gurl.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#endif  // defined(OS_ANDROID)
+
 namespace blimp {
 namespace client {
 
+#if defined(OS_ANDROID)
+class BlimpContentsImplAndroid;
+#endif  // defined(OS_ANDROID)
+
 class BlimpContentsObserver;
 class BlimpNavigationController;
 
 // BlimpContentsImpl is the implementation of the core class in
 // //blimp/client/core, the BlimpContents.
 class BlimpContentsImpl : public BlimpContents,
-                          public BlimpNavigationControllerDelegate {
+                          public BlimpNavigationControllerDelegate,
+                          base::SupportsUserData {
  public:
   BlimpContentsImpl();
   ~BlimpContentsImpl() override;
 
+#if defined(OS_ANDROID)
+  base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl();
+  BlimpContentsImplAndroid* GetBlimpContentsImplAndroid();
+#endif  // defined(OS_ANDROID)
+
   // BlimpContents implementation.
   BlimpNavigationControllerImpl& GetNavigationController() override;
   void AddObserver(BlimpContentsObserver* observer) override;