summaryrefslogtreecommitdiffstats
path: root/net/android
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 21:00:06 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 21:00:06 +0000
commitad6e67411dc0a1b96d4ef62d30c970f907712427 (patch)
tree570912091cbc064ecb997d633bcb7b45cb5c16db /net/android
parent58e4f1d662ec12939a204e5986e8a0047b1f954d (diff)
downloadchromium_src-ad6e67411dc0a1b96d4ef62d30c970f907712427.zip
chromium_src-ad6e67411dc0a1b96d4ef62d30c970f907712427.tar.gz
chromium_src-ad6e67411dc0a1b96d4ef62d30c970f907712427.tar.bz2
Revert 158067 - Remove native side of content_view_client
This moves related callabcks from content_view_client to web_contents_observer_android and makes the client a Java only API. This broke the compile: http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20Builder%20%28dbg%29&number=16035 ErrorCodeConversionHelper, new in this change, failed to build. BUG=137967 Review URL: https://chromiumcodereview.appspot.com/10952029 TBR=yusufo@chromium.org Review URL: https://codereview.chromium.org/10969045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
-rw-r--r--net/android/java/net_errors_java.template2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/android/java/net_errors_java.template b/net/android/java/net_errors_java.template
index c375685..1da7031 100644
--- a/net/android/java/net_errors_java.template
+++ b/net/android/java/net_errors_java.template
@@ -5,7 +5,7 @@
package org.chromium.net;
public class NetError {
-#define NET_ERROR(name, value) public static final int ERR_##name = value;
+#define NET_ERROR(name, value) public static int ERR_##name = value;
#include "net/base/net_error_list.h"
}