Chromium Code Reviews| 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 4a602133fd50169ed1ad79f7ea28419ffd9fe950..6ffe1bdea5a7307ff94ce58a7c0f85e2d91ca6b5 100644 |
| --- a/content/browser/android/content_view_core_impl.h |
| +++ b/content/browser/android/content_view_core_impl.h |
| @@ -48,7 +48,7 @@ class ContentViewCoreImpl : public ContentViewCore, |
| virtual ui::WindowAndroid* GetWindowAndroid() OVERRIDE; |
| virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE; |
| virtual void OnWebPreferencesUpdated() OVERRIDE; |
| - virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE; |
| + virtual void ShowPastePopup(int x, int y) OVERRIDE; |
| // -------------------------------------------------------------------------- |
| // Methods called from Java via JNI |
| @@ -146,6 +146,7 @@ class ContentViewCoreImpl : public ContentViewCore, |
| int GetNativeImeAdapter(JNIEnv* env, jobject obj); |
| void SetFocus(JNIEnv* env, jobject obj, jboolean focused); |
| void ScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj); |
| + virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE; |
|
nilesh
2012/10/10 21:18:52
Why are you moving this?
shashi
2012/10/11 01:59:58
I was moving this because it was called by JNI, bu
|
| void UndoScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj); |
| jint GetBackgroundColor(JNIEnv* env, jobject obj); |