summaryrefslogtreecommitdiffstats
path: root/base/android
diff options
context:
space:
mode:
authoryusufo@chromium.org <yusufo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-22 01:21:32 +0000
committeryusufo@chromium.org <yusufo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-22 01:21:32 +0000
commit7ebed72c88826819cdd70556ec1e8b12a9bc5b1d (patch)
treebf04c7043a808c1060cb163d17adb92209d8249b /base/android
parent9044da61083433b53cace2554f3c7e2230c683c9 (diff)
downloadchromium_src-7ebed72c88826819cdd70556ec1e8b12a9bc5b1d.zip
chromium_src-7ebed72c88826819cdd70556ec1e8b12a9bc5b1d.tar.gz
chromium_src-7ebed72c88826819cdd70556ec1e8b12a9bc5b1d.tar.bz2
Revert "Revert 158067 - Remove native side of content_view_client"
The previous CL broke the build, because the changes in net_errors_java.template didn't get the net_error_java target to be rebuilt. We needed a net.gyp change that makes sure NetError.java gets recreated after the changes. BUG=137967 TBR=jam@chromium.org, mkosiba@chromium.org, willchan@chromium.org Review URL: https://chromiumcodereview.appspot.com/10963041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android')
-rwxr-xr-xbase/android/jni_generator/jni_generator.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py
index 876247a..7f07320 100755
--- a/base/android/jni_generator/jni_generator.py
+++ b/base/android/jni_generator/jni_generator.py
@@ -178,7 +178,6 @@ def JavaParamToJni(param):
'Lorg/chromium/chrome/browser/ProcessUtils',
'Lorg/chromium/chrome/browser/component/web_contents_delegate_android/WebContentsDelegateAndroid',
'Lorg/chromium/content/browser/ContentVideoView',
- 'Lorg/chromium/content/browser/ContentViewClient',
'Lorg/chromium/content/browser/ContentViewCore',
'Lorg/chromium/content/browser/DeviceOrientation',
'Lorg/chromium/content/browser/FindNotificationDetails',