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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin.cc

Issue 18281002: Move WebDropData to content::DropData and split off conversion function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac build error. Created 7 years, 5 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 | « content/public/common/drop_data.cc ('k') | content/renderer/drop_data_builder.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "content/renderer/browser_plugin/browser_plugin.h" 5 #include "content/renderer/browser_plugin/browser_plugin.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_string_value_serializer.h" 8 #include "base/json/json_string_value_serializer.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "content/common/browser_plugin/browser_plugin_constants.h" 13 #include "content/common/browser_plugin/browser_plugin_constants.h"
14 #include "content/common/browser_plugin/browser_plugin_messages.h" 14 #include "content/common/browser_plugin/browser_plugin_messages.h"
15 #include "content/common/view_messages.h" 15 #include "content/common/view_messages.h"
16 #include "content/public/common/content_client.h" 16 #include "content/public/common/content_client.h"
17 #include "content/public/common/content_switches.h" 17 #include "content/public/common/content_switches.h"
18 #include "content/public/renderer/content_renderer_client.h" 18 #include "content/public/renderer/content_renderer_client.h"
19 #include "content/renderer/browser_plugin/browser_plugin_bindings.h" 19 #include "content/renderer/browser_plugin/browser_plugin_bindings.h"
20 #include "content/renderer/browser_plugin/browser_plugin_compositing_helper.h" 20 #include "content/renderer/browser_plugin/browser_plugin_compositing_helper.h"
21 #include "content/renderer/browser_plugin/browser_plugin_manager.h" 21 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
22 #include "content/renderer/drop_data_builder.h"
22 #include "content/renderer/render_process_impl.h" 23 #include "content/renderer/render_process_impl.h"
23 #include "content/renderer/render_thread_impl.h" 24 #include "content/renderer/render_thread_impl.h"
24 #include "content/renderer/v8_value_converter_impl.h" 25 #include "content/renderer/v8_value_converter_impl.h"
25 #include "skia/ext/platform_canvas.h" 26 #include "skia/ext/platform_canvas.h"
26 #include "third_party/WebKit/public/web/WebBindings.h" 27 #include "third_party/WebKit/public/web/WebBindings.h"
27 #include "third_party/WebKit/public/web/WebDOMCustomEvent.h" 28 #include "third_party/WebKit/public/web/WebDOMCustomEvent.h"
28 #include "third_party/WebKit/public/web/WebDocument.h" 29 #include "third_party/WebKit/public/web/WebDocument.h"
29 #include "third_party/WebKit/public/web/WebElement.h" 30 #include "third_party/WebKit/public/web/WebElement.h"
30 #include "third_party/WebKit/public/web/WebFrame.h" 31 #include "third_party/WebKit/public/web/WebFrame.h"
31 #include "third_party/WebKit/public/web/WebInputEvent.h" 32 #include "third_party/WebKit/public/web/WebInputEvent.h"
(...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1522 WebKit::WebDragOperationsMask mask, 1523 WebKit::WebDragOperationsMask mask,
1523 const WebKit::WebPoint& position, 1524 const WebKit::WebPoint& position,
1524 const WebKit::WebPoint& screen) { 1525 const WebKit::WebPoint& screen) {
1525 if (guest_crashed_ || !HasGuestInstanceID()) 1526 if (guest_crashed_ || !HasGuestInstanceID())
1526 return false; 1527 return false;
1527 browser_plugin_manager()->Send( 1528 browser_plugin_manager()->Send(
1528 new BrowserPluginHostMsg_DragStatusUpdate( 1529 new BrowserPluginHostMsg_DragStatusUpdate(
1529 render_view_routing_id_, 1530 render_view_routing_id_,
1530 guest_instance_id_, 1531 guest_instance_id_,
1531 drag_status, 1532 drag_status,
1532 WebDropData(drag_data), 1533 DropDataBuilder::Build(drag_data),
1533 mask, 1534 mask,
1534 position)); 1535 position));
1535 return true; 1536 return true;
1536 } 1537 }
1537 1538
1538 void BrowserPlugin::didReceiveResponse( 1539 void BrowserPlugin::didReceiveResponse(
1539 const WebKit::WebURLResponse& response) { 1540 const WebKit::WebURLResponse& response) {
1540 } 1541 }
1541 1542
1542 void BrowserPlugin::didReceiveData(const char* data, int data_length) { 1543 void BrowserPlugin::didReceiveData(const char* data, int data_length) {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 const WebKit::WebMouseEvent& event) { 1593 const WebKit::WebMouseEvent& event) {
1593 browser_plugin_manager()->Send( 1594 browser_plugin_manager()->Send(
1594 new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_, 1595 new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
1595 guest_instance_id_, 1596 guest_instance_id_,
1596 plugin_rect_, 1597 plugin_rect_,
1597 &event)); 1598 &event));
1598 return true; 1599 return true;
1599 } 1600 }
1600 1601
1601 } // namespace content 1602 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/drop_data.cc ('k') | content/renderer/drop_data_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698