| Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| index fb25e974d98c180cba32b7984716c05d75c6d8d6..0db4e4f0c38840a8619dec7ea5d531c5a985b374 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| @@ -50,7 +50,7 @@ public class ContentView extends FrameLayout
|
| * @param windowAndroid An instance of the WindowAndroid.
|
| * @return A ContentView instance.
|
| */
|
| - public static ContentView newInstance(Context context, int nativeWebContents,
|
| + public static ContentView newInstance(Context context, long nativeWebContents,
|
| WindowAndroid windowAndroid) {
|
| return newInstance(context, nativeWebContents, windowAndroid, null,
|
| android.R.attr.webViewStyle);
|
| @@ -65,7 +65,7 @@ public class ContentView extends FrameLayout
|
| * @param attrs The attributes of the XML tag that is inflating the view.
|
| * @return A ContentView instance.
|
| */
|
| - public static ContentView newInstance(Context context, int nativeWebContents,
|
| + public static ContentView newInstance(Context context, long nativeWebContents,
|
| WindowAndroid windowAndroid, AttributeSet attrs) {
|
| // TODO(klobag): use the WebViewStyle as the default style for now. It enables scrollbar.
|
| // When ContentView is moved to framework, we can define its own style in the res.
|
| @@ -83,7 +83,7 @@ public class ContentView extends FrameLayout
|
| * @param defStyle The default style to apply to this view.
|
| * @return A ContentView instance.
|
| */
|
| - public static ContentView newInstance(Context context, int nativeWebContents,
|
| + public static ContentView newInstance(Context context, long nativeWebContents,
|
| WindowAndroid windowAndroid, AttributeSet attrs, int defStyle) {
|
| if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
|
| return new ContentView(context, nativeWebContents, windowAndroid, attrs, defStyle);
|
| @@ -93,7 +93,7 @@ public class ContentView extends FrameLayout
|
| }
|
| }
|
|
|
| - protected ContentView(Context context, int nativeWebContents, WindowAndroid windowAndroid,
|
| + protected ContentView(Context context, long nativeWebContents, WindowAndroid windowAndroid,
|
| AttributeSet attrs, int defStyle) {
|
| super(context, attrs, defStyle);
|
|
|
|
|