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 6ed389874e60ad69ec852668995aa31df13d0745..5f6ae4161390f8cc3000d46eea30ee530c138003 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -1164,20 +1164,19 @@ void RenderWidgetHostViewAndroid::OnSetNeedsFlushInput() { |
content_view_core_->GetWindowAndroid()->RequestVSyncUpdate(); |
} |
-void RenderWidgetHostViewAndroid::CreateBrowserAccessibilityManagerIfNeeded() { |
+BrowserAccessibilityManager* |
+ RenderWidgetHostViewAndroid::CreateBrowserAccessibilityManager( |
+ BrowserAccessibilityDelegate* delegate) { |
if (!host_ || host_->accessibility_mode() != AccessibilityModeComplete) |
- return; |
+ return NULL; |
- if (!GetBrowserAccessibilityManager()) { |
- base::android::ScopedJavaLocalRef<jobject> obj; |
- if (content_view_core_) |
- obj = content_view_core_->GetJavaObject(); |
- SetBrowserAccessibilityManager( |
- new BrowserAccessibilityManagerAndroid( |
- obj, |
- BrowserAccessibilityManagerAndroid::GetEmptyDocument(), |
- host_)); |
- } |
+ base::android::ScopedJavaLocalRef<jobject> obj; |
+ if (content_view_core_) |
+ obj = content_view_core_->GetJavaObject(); |
+ return new BrowserAccessibilityManagerAndroid( |
+ obj, |
+ BrowserAccessibilityManagerAndroid::GetEmptyDocument(), |
+ delegate); |
} |
bool RenderWidgetHostViewAndroid::LockMouse() { |
@@ -1263,12 +1262,13 @@ void RenderWidgetHostViewAndroid::SetContentViewCore( |
content_view_core_ = content_view_core; |
- if (GetBrowserAccessibilityManager()) { |
+ BrowserAccessibilityManager* manager = |
+ host_->GetRootBrowserAccessibilityManager(); |
+ if (manager) { |
base::android::ScopedJavaLocalRef<jobject> obj; |
if (content_view_core_) |
obj = content_view_core_->GetJavaObject(); |
- GetBrowserAccessibilityManager()->ToBrowserAccessibilityManagerAndroid()-> |
- SetContentViewCore(obj); |
+ manager->ToBrowserAccessibilityManagerAndroid()->SetContentViewCore(obj); |
} |
AttachLayers(); |