| Index: content/renderer/npapi/webplugin_delegate_proxy.cc
|
| diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc
|
| index 80cb2ea2879dafba1f343461bc353c697e7a5243..7d5bf548ab0b0b0500ed2fddb7b993317cd63210 100644
|
| --- a/content/renderer/npapi/webplugin_delegate_proxy.cc
|
| +++ b/content/renderer/npapi/webplugin_delegate_proxy.cc
|
| @@ -67,12 +67,12 @@
|
| #include "content/public/common/sandbox_init.h"
|
| #endif
|
|
|
| -using WebKit::WebBindings;
|
| -using WebKit::WebCursorInfo;
|
| -using WebKit::WebDragData;
|
| -using WebKit::WebInputEvent;
|
| -using WebKit::WebString;
|
| -using WebKit::WebView;
|
| +using blink::WebBindings;
|
| +using blink::WebCursorInfo;
|
| +using blink::WebDragData;
|
| +using blink::WebInputEvent;
|
| +using blink::WebString;
|
| +using blink::WebView;
|
|
|
| namespace content {
|
|
|
| @@ -848,7 +848,7 @@ void WebPluginDelegateProxy::SetContainerVisibility(bool is_visible) {
|
| if (is_visible) {
|
| gfx::Rect window_frame = render_view_->rootWindowRect();
|
| gfx::Rect view_frame = render_view_->windowRect();
|
| - WebKit::WebView* webview = render_view_->webview();
|
| + blink::WebView* webview = render_view_->webview();
|
| msg = new PluginMsg_ContainerShown(instance_id_, window_frame, view_frame,
|
| webview && webview->isActive());
|
| } else {
|
| @@ -935,7 +935,7 @@ void WebPluginDelegateProxy::OnNotifyIMEStatus(int input_type,
|
| ViewHostMsg_SelectionBounds_Params bounds_params;
|
| bounds_params.anchor_rect = bounds_params.focus_rect = caret_rect;
|
| bounds_params.anchor_dir = bounds_params.focus_dir =
|
| - WebKit::WebTextDirectionLeftToRight;
|
| + blink::WebTextDirectionLeftToRight;
|
| bounds_params.is_anchor_first = true;
|
| render_view_->Send(new ViewHostMsg_SelectionBoundsChanged(
|
| render_view_->routing_id(),
|
|
|