Add WebContents accessor in ContentViewCore interface.

content/browser/android/content_view_core_impl.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <vector>
 
 #include "base/android/jni_helper.h"
@@ skipping 25 matching lines @@
 class ContentViewCoreImpl : public ContentViewCore,
                             public NotificationObserver {
  public:
   ContentViewCoreImpl(JNIEnv* env,
                       jobject obj,
                       bool hardware_accelerated,
                       bool take_ownership_of_web_contents,
                       WebContents* web_contents,
                       ui::WindowAndroid* window_android);
 
-  // ContentViewCore overrides
+  // ContentViewCore implementation.
   virtual void Destroy(JNIEnv* env, jobject obj) OVERRIDE;
+  virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;
+  virtual WebContents* GetWebContents() const OVERRIDE;
+  virtual ui::WindowAndroid* GetWindowAndroid() OVERRIDE;
 
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
   // --------------------------------------------------------------------------
 
   // Notifies the ContentViewCore that items were selected in the currently
   // showing select popup.
   void SelectPopupMenuItems(JNIEnv* env, jobject obj, jintArray indices);
 
   void LoadUrl(
@@ skipping 43 matching lines @@
                  jint y,
                  jboolean disambiguation_popup_tap);
   void PinchBegin(JNIEnv* env, jobject obj, jlong time_ms, jint x, jint y);
   void PinchEnd(JNIEnv* env, jobject obj, jlong time_ms);
   void PinchBy(JNIEnv* env,
                jobject obj,
                jlong time_ms,
                jint x,
                jint y,
                jfloat delta);
-  virtual void SelectBetweenCoordinates(JNIEnv* env, jobject obj,
+  void SelectBetweenCoordinates(JNIEnv* env, jobject obj,
                                         jint x1, jint y1,
-                                        jint x2, jint y2) OVERRIDE;
+                                        jint x2, jint y2);
   jboolean CanGoBack(JNIEnv* env, jobject obj);
   jboolean CanGoForward(JNIEnv* env, jobject obj);
   jboolean CanGoToOffset(JNIEnv* env, jobject obj, jint offset);
   void GoBack(JNIEnv* env, jobject obj);
   void GoForward(JNIEnv* env, jobject obj);
   void GoToOffset(JNIEnv* env, jobject obj, jint offset);
   void StopLoading(JNIEnv* env, jobject obj);
   void Reload(JNIEnv* env, jobject obj);
   jboolean NeedsReload(JNIEnv* env, jobject obj);
   void ClearHistory(JNIEnv* env, jobject obj);
   void SetClient(JNIEnv* env, jobject obj, jobject jclient);
   jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script);
-  virtual int GetNativeImeAdapter(JNIEnv* env, jobject obj) OVERRIDE;
-  virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;
+  int GetNativeImeAdapter(JNIEnv* env, jobject obj);
   void AddJavascriptInterface(JNIEnv* env,
                               jobject obj,
                               jobject object,
                               jstring name,
                               jboolean require_annotation);
   void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name);
   int GetNavigationHistory(JNIEnv* env, jobject obj, jobject context);
 
   // --------------------------------------------------------------------------
   // Public methods that call to Java via JNI
@@ skipping 29 matching lines @@
   // Called when page loading begins.
   void DidStartLoading();
   void StartContentIntent(const GURL& content_url);
 
   // --------------------------------------------------------------------------
   // Methods called from native code
   // --------------------------------------------------------------------------
 
   gfx::Rect GetBounds() const;
 
-  WebContents* web_contents() const { return web_contents_; }
-
-  virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
-  virtual ui::WindowAndroid* GetWindowAndroid() OVERRIDE;
+  void LoadUrl(NavigationController::LoadURLParams& params);
 
  private:
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // --------------------------------------------------------------------------
   // Private methods that call to Java via JNI
   // --------------------------------------------------------------------------
@@ skipping 37 matching lines @@
   ui::WindowAndroid* window_android_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_