| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index b50408eaebb12fa5dcde62aa30d9ad66412a2132..df811e675a23234796a136c050118b69eae662ce 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -1608,19 +1608,12 @@ void RenderWidgetHostViewAndroid::OnSetNeedsFlushInput() {
|
| BrowserAccessibilityManager*
|
| RenderWidgetHostViewAndroid::CreateBrowserAccessibilityManager(
|
| BrowserAccessibilityDelegate* delegate) {
|
| - // TODO(dmazzoni): Currently there can only be one
|
| - // BrowserAccessibilityManager per ContentViewCore, so return NULL
|
| - // if there's already a BrowserAccessibilityManager for the main
|
| - // frame. Eventually, in order to support cross-process iframes on
|
| - // Android we'll need to add support for a
|
| - // BrowserAccessibilityManager for a child frame.
|
| - // http://crbug.com/423846
|
| - if (!host_ || host_->GetRootBrowserAccessibilityManager())
|
| - return NULL;
|
| -
|
| base::android::ScopedJavaLocalRef<jobject> obj;
|
| - if (content_view_core_)
|
| + if (host_ &&
|
| + host_->GetRootBrowserAccessibilityManager() &&
|
| + content_view_core_) {
|
| obj = content_view_core_->GetJavaObject();
|
| + }
|
| return new BrowserAccessibilityManagerAndroid(
|
| obj,
|
| BrowserAccessibilityManagerAndroid::GetEmptyDocument(),
|
|
|