Replace ENABLE_JAVA_BRIDGE with OS_ANDROID.
This fixes a discrepancy between the definitions of WebContentsImpl in the Chrome and test binaries, since ENABLE_JAVA_BRIDGE wasn't defined in the test build files.
BUG=247807
TEST=WebContentsImplTest.* should pass after adding a field to WebContentsImpl.
Review URL: https://chromiumcodereview.appspot.com/16630004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205929 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 664bad6..ac97b98 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -98,7 +98,7 @@
#include "ui/surface/io_surface_support_mac.h"
#endif
-#if defined(ENABLE_JAVA_BRIDGE)
+#if defined(OS_ANDROID)
#include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
#endif
@@ -1239,7 +1239,7 @@
registrar_.Add(this,
NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
NotificationService::AllBrowserContextsAndSources());
-#if defined(ENABLE_JAVA_BRIDGE)
+#if defined(OS_ANDROID)
java_bridge_dispatcher_host_manager_.reset(
new JavaBridgeDispatcherHostManager(this));
#endif
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index ea8cbfb..bbc0a9b 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -146,7 +146,7 @@
// Unsets the currently showing interstitial.
void DetachInterstitialPage();
-#if defined(ENABLE_JAVA_BRIDGE)
+#if defined(OS_ANDROID)
JavaBridgeDispatcherHostManager* java_bridge_dispatcher_host_manager() const {
return java_bridge_dispatcher_host_manager_.get();
}
@@ -780,7 +780,7 @@
// Manages creation and swapping of render views.
RenderViewHostManager render_manager_;
-#if defined(ENABLE_JAVA_BRIDGE)
+#if defined(OS_ANDROID)
// Manages injecting Java objects into all RenderViewHosts associated with
// this WebContentsImpl.
scoped_ptr<JavaBridgeDispatcherHostManager>
diff --git a/content/common/java_bridge_messages.h b/content/common/java_bridge_messages.h
index f6aa48f..62923c7 100644
--- a/content/common/java_bridge_messages.h
+++ b/content/common/java_bridge_messages.h
@@ -6,7 +6,7 @@
// Multiply-included message file, hence no include guard.
-#if defined(ENABLE_JAVA_BRIDGE)
+#if defined(OS_ANDROID)
#include "content/child/plugin_param_traits.h"
#include "ipc/ipc_channel_handle.h"
@@ -37,4 +37,4 @@
IPC_SYNC_MESSAGE_ROUTED0_1(JavaBridgeHostMsg_GetChannelHandle,
IPC::ChannelHandle) /* channel handle */
-#endif // defined(ENABLE_JAVA_BRIDGE)
+#endif // defined(OS_ANDROID)
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index eb8843c0..719166d 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1294,6 +1294,10 @@
['include', '^browser/speech/speech_recognition_manager_impl'],
['include', '^browser/speech/speech_recognizer\\.h$'],
],
+ }, {
+ 'sources/': [
+ ['exclude', '^browser/renderer_host/java/'],
+ ],
}],
['OS=="mac"', {
'sources': [
@@ -1408,15 +1412,6 @@
['exclude', '^browser/renderer_host/pepper/'],
],
}],
- ['java_bridge==1', {
- 'defines': [
- 'ENABLE_JAVA_BRIDGE',
- ],
- }, {
- 'sources/': [
- ['exclude', '^browser/renderer_host/java/'],
- ],
- }],
['input_speech==0', {
'sources/': [
['exclude', '^browser/speech/input_tag_speech_dispatcher_host'],
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 50fc91b..cc9e38e3 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -445,11 +445,6 @@
'common/gpu/media/android_video_decode_accelerator.h',
],
}],
- ['java_bridge==1', {
- 'defines': [
- 'ENABLE_JAVA_BRIDGE',
- ],
- }],
['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
'dependencies': [
'../media/media.gyp:media',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 2aa731f..df1a65a3 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -374,6 +374,13 @@
'includes': [
'../build/android/cpufeatures.gypi',
],
+ }, {
+ 'sources!': [
+ 'renderer/java/java_bridge_channel.cc',
+ 'renderer/java/java_bridge_channel.h',
+ 'renderer/java/java_bridge_dispatcher.cc',
+ 'renderer/java/java_bridge_dispatcher.h',
+ ],
}],
# TODO(jrg): remove the OS=="android" section?
# http://crbug.com/113172
@@ -480,18 +487,6 @@
'renderer/render_widget_fullscreen_pepper.h',
],
}],
- ['java_bridge==1', {
- 'defines': [
- 'ENABLE_JAVA_BRIDGE',
- ],
- }, {
- 'sources!': [
- 'renderer/java/java_bridge_channel.cc',
- 'renderer/java/java_bridge_channel.h',
- 'renderer/java/java_bridge_dispatcher.cc',
- 'renderer/java/java_bridge_dispatcher.h',
- ],
- }],
],
'target_conditions': [
['OS=="android"', {
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 48314fd..284637e 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1236,7 +1236,7 @@
IPC_MESSAGE_HANDLER(ViewMsg_SetHistoryLengthAndPrune,
OnSetHistoryLengthAndPrune)
IPC_MESSAGE_HANDLER(ViewMsg_EnableViewSourceMode, OnEnableViewSourceMode)
-#if defined(ENABLE_JAVA_BRIDGE)
+#if defined(OS_ANDROID)
IPC_MESSAGE_HANDLER(JavaBridgeMsg_Init, OnJavaBridgeInit)
#endif
IPC_MESSAGE_HANDLER(ViewMsg_SetAccessibilityMode, OnSetAccessibilityMode)
@@ -6589,7 +6589,7 @@
main_frame->enableViewSourceMode(true);
}
-#if defined(ENABLE_JAVA_BRIDGE)
+#if defined(OS_ANDROID)
void RenderViewImpl::OnJavaBridgeInit() {
DCHECK(!java_bridge_dispatcher_);
java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
