Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| index f928a0e9e749e76e9ceddd54174667c3475d7020..cc27ebebffe5286553e2a8d3967f198e70e328d8 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| @@ -793,9 +793,11 @@ void RenderWidgetHostViewAura::FocusedNodeTouched( |
| ui::OnScreenKeyboardDisplayManager* osk_display_manager = |
| ui::OnScreenKeyboardDisplayManager::GetInstance(); |
| DCHECK(osk_display_manager); |
| - if (editable && host_ && host_->GetView()) { |
| + if (editable && host_ && host_->GetView() && host_->delegate()) { |
| + RenderWidgetHostImpl* host = |
| + host_->delegate()->GetFocusedRenderWidgetHost(host_); |
| keyboard_observer_.reset(new WinScreenKeyboardObserver( |
| - host_, location_dips_screen, device_scale_factor_, window_)); |
| + host, location_dips_screen, device_scale_factor_, window_)); |
|
ncarter (slow)
2016/12/16 19:17:21
I'm thinking about the case here where (host_ != h
EhsanK
2016/12/20 16:39:11
Agreed. It is probably actually incorrect.
|
| virtual_keyboard_requested_ = |
| osk_display_manager->DisplayVirtualKeyboard(keyboard_observer_.get()); |
| } else { |