Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(331)

Unified Diff: content/browser/android/content_view_core_impl.h

Issue 10908285: Add WebContents accessor in ContentViewCore interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 9ddc2421f250372ff379f4b4566990b3104a0c99..a02f3fd8fedeeaf5e9bb35ccf3692ec8b5264379 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -43,8 +43,11 @@ class ContentViewCoreImpl : public ContentViewCore,
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
@@ -108,9 +111,9 @@ class ContentViewCoreImpl : public ContentViewCore,
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);
@@ -123,8 +126,7 @@ class ContentViewCoreImpl : public ContentViewCore,
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,
@@ -174,10 +176,7 @@ class ContentViewCoreImpl : public ContentViewCore,
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.

Powered by Google App Engine
This is Rietveld 408576698