Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: components/plugins/renderer/webview_plugin.cc

Issue 226093007: Convert Chrome usages of WebFrame to WebLocalFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « components/plugins/renderer/webview_plugin.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/plugins/renderer/webview_plugin.h" 5 #include "components/plugins/renderer/webview_plugin.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/numerics/safe_conversions.h" 9 #include "base/numerics/safe_conversions.h"
10 #include "content/public/renderer/web_preferences.h" 10 #include "content/public/renderer/web_preferences.h"
(...skipping 10 matching lines...) Expand all
21 #include "third_party/WebKit/public/web/WebView.h" 21 #include "third_party/WebKit/public/web/WebView.h"
22 #include "webkit/common/webpreferences.h" 22 #include "webkit/common/webpreferences.h"
23 23
24 using blink::WebCanvas; 24 using blink::WebCanvas;
25 using blink::WebCursorInfo; 25 using blink::WebCursorInfo;
26 using blink::WebDragData; 26 using blink::WebDragData;
27 using blink::WebDragOperationsMask; 27 using blink::WebDragOperationsMask;
28 using blink::WebFrame; 28 using blink::WebFrame;
29 using blink::WebImage; 29 using blink::WebImage;
30 using blink::WebInputEvent; 30 using blink::WebInputEvent;
31 using blink::WebLocalFrame;
31 using blink::WebMouseEvent; 32 using blink::WebMouseEvent;
32 using blink::WebPlugin; 33 using blink::WebPlugin;
33 using blink::WebPluginContainer; 34 using blink::WebPluginContainer;
34 using blink::WebPoint; 35 using blink::WebPoint;
35 using blink::WebRect; 36 using blink::WebRect;
36 using blink::WebSize; 37 using blink::WebSize;
37 using blink::WebString; 38 using blink::WebString;
38 using blink::WebURLError; 39 using blink::WebURLError;
39 using blink::WebURLRequest; 40 using blink::WebURLRequest;
40 using blink::WebURLResponse; 41 using blink::WebURLResponse;
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 } 204 }
204 205
205 bool WebViewPlugin::acceptsLoadDrops() { return false; } 206 bool WebViewPlugin::acceptsLoadDrops() { return false; }
206 207
207 void WebViewPlugin::setToolTipText(const WebString& text, 208 void WebViewPlugin::setToolTipText(const WebString& text,
208 blink::WebTextDirection hint) { 209 blink::WebTextDirection hint) {
209 if (container_) 210 if (container_)
210 container_->element().setAttribute("title", text); 211 container_->element().setAttribute("title", text);
211 } 212 }
212 213
213 void WebViewPlugin::startDragging(WebFrame*, 214 void WebViewPlugin::startDragging(WebLocalFrame*,
214 const WebDragData&, 215 const WebDragData&,
215 WebDragOperationsMask, 216 WebDragOperationsMask,
216 const WebImage&, 217 const WebImage&,
217 const WebPoint&) { 218 const WebPoint&) {
218 // Immediately stop dragging. 219 // Immediately stop dragging.
219 web_view_->dragSourceSystemDragEnded(); 220 web_view_->dragSourceSystemDragEnded();
220 } 221 }
221 222
222 void WebViewPlugin::didInvalidateRect(const WebRect& rect) { 223 void WebViewPlugin::didInvalidateRect(const WebRect& rect) {
223 if (container_) 224 if (container_)
224 container_->invalidateRect(rect); 225 container_->invalidateRect(rect);
225 } 226 }
226 227
227 void WebViewPlugin::didChangeCursor(const WebCursorInfo& cursor) { 228 void WebViewPlugin::didChangeCursor(const WebCursorInfo& cursor) {
228 current_cursor_ = cursor; 229 current_cursor_ = cursor;
229 } 230 }
230 231
231 void WebViewPlugin::didClearWindowObject(WebFrame* frame, int world_id) { 232 void WebViewPlugin::didClearWindowObject(WebLocalFrame* frame, int world_id) {
232 if (delegate_) 233 if (delegate_)
233 delegate_->BindWebFrame(frame); 234 delegate_->BindWebFrame(frame);
234 } 235 }
235 236
236 void WebViewPlugin::didReceiveResponse(WebFrame* frame, 237 void WebViewPlugin::didReceiveResponse(WebLocalFrame* frame,
237 unsigned identifier, 238 unsigned identifier,
238 const WebURLResponse& response) { 239 const WebURLResponse& response) {
239 WebFrameClient::didReceiveResponse(frame, identifier, response); 240 WebFrameClient::didReceiveResponse(frame, identifier, response);
240 } 241 }
OLDNEW
« no previous file with comments | « components/plugins/renderer/webview_plugin.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698