diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
| commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
| tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/content/plugin/webplugin_delegate_stub.cc | |
| parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/content/plugin/webplugin_delegate_stub.cc')
| -rw-r--r-- | chromium/content/plugin/webplugin_delegate_stub.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/content/plugin/webplugin_delegate_stub.cc b/chromium/content/plugin/webplugin_delegate_stub.cc index fd4827d320b..81267b5f64f 100644 --- a/chromium/content/plugin/webplugin_delegate_stub.cc +++ b/chromium/content/plugin/webplugin_delegate_stub.cc @@ -13,6 +13,7 @@ #include "content/child/npapi/webplugin_delegate_impl.h" #include "content/child/npapi/webplugin_resource_client.h" #include "content/child/plugin_messages.h" +#include "content/common/cursors/webcursor.h" #include "content/plugin/plugin_channel.h" #include "content/plugin/plugin_thread.h" #include "content/plugin/webplugin_proxy.h" @@ -24,7 +25,6 @@ #include "third_party/WebKit/public/web/WebBindings.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" -#include "webkit/common/cursors/webcursor.h" using blink::WebBindings; using blink::WebCursorInfo; @@ -345,9 +345,7 @@ void WebPluginDelegateStub::OnImeCompositionUpdated( int cursor_position) { if (delegate_) delegate_->ImeCompositionUpdated(text, clauses, target, cursor_position); -#if defined(OS_WIN) && !defined(USE_AURA) webplugin_->UpdateIMEStatus(); -#endif } void WebPluginDelegateStub::OnImeCompositionCompleted( @@ -444,7 +442,8 @@ void WebPluginDelegateStub::OnFetchURL( params.notify_redirect, params.is_plugin_src_load, channel_->renderer_id(), - params.render_view_id); + params.render_frame_id, + webplugin_->host_render_view_routing_id()); } } // namespace content |