| 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 de0393353e4e7db726106aa64fcf4f5881bf2a41..26bb8b22e98b544b0c5258e3ae6d184effcae70d 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -48,7 +48,9 @@ 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 SelectText(const string16& text,
|
| + int selection_start_x,
|
| + int selection_start_y) OVERRIDE;
|
|
|
| // --------------------------------------------------------------------------
|
| // Methods called from Java via JNI
|
| @@ -141,7 +143,7 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script);
|
| int GetNativeImeAdapter(JNIEnv* env, jobject obj);
|
| void SetFocus(JNIEnv* env, jobject obj, jboolean focused);
|
| -
|
| + virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE;
|
| jint GetBackgroundColor(JNIEnv* env, jobject obj);
|
| void SetBackgroundColor(JNIEnv* env, jobject obj, jint color);
|
| void OnShow(JNIEnv* env, jobject obj);
|
|
|