OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_view_host.h" | 5 #include "chrome/browser/renderer_host/render_view_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
(...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1239 StopHangMonitorTimeout(); | 1239 StopHangMonitorTimeout(); |
1240 delegate_->ShowModalHTMLDialog(url, width, height, json_arguments, reply_msg); | 1240 delegate_->ShowModalHTMLDialog(url, width, height, json_arguments, reply_msg); |
1241 } | 1241 } |
1242 | 1242 |
1243 void RenderViewHost::MediaPlayerActionAt(const gfx::Point& location, | 1243 void RenderViewHost::MediaPlayerActionAt(const gfx::Point& location, |
1244 const WebMediaPlayerAction& action) { | 1244 const WebMediaPlayerAction& action) { |
1245 // TODO(ajwong): Which thread should run this? Does it matter? | 1245 // TODO(ajwong): Which thread should run this? Does it matter? |
1246 Send(new ViewMsg_MediaPlayerActionAt(routing_id(), location, action)); | 1246 Send(new ViewMsg_MediaPlayerActionAt(routing_id(), location, action)); |
1247 } | 1247 } |
1248 | 1248 |
1249 void RenderViewHost::ContextMenuClosed() { | 1249 void RenderViewHost::ContextMenuClosed( |
1250 Send(new ViewMsg_ContextMenuClosed(routing_id())); | 1250 const webkit_glue::CustomContextMenuContext& custom_context) { |
| 1251 Send(new ViewMsg_ContextMenuClosed(routing_id(), custom_context)); |
1251 } | 1252 } |
1252 | 1253 |
1253 void RenderViewHost::PrintNodeUnderContextMenu() { | 1254 void RenderViewHost::PrintNodeUnderContextMenu() { |
1254 Send(new ViewMsg_PrintNodeUnderContextMenu(routing_id())); | 1255 Send(new ViewMsg_PrintNodeUnderContextMenu(routing_id())); |
1255 } | 1256 } |
1256 | 1257 |
1257 void RenderViewHost::OnMsgStartDragging( | 1258 void RenderViewHost::OnMsgStartDragging( |
1258 const WebDropData& drop_data, | 1259 const WebDropData& drop_data, |
1259 WebDragOperationsMask drag_operations_mask, | 1260 WebDragOperationsMask drag_operations_mask, |
1260 const SkBitmap& image, | 1261 const SkBitmap& image, |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1493 | 1494 |
1494 void RenderViewHost::BlockExtensionRequest(int request_id) { | 1495 void RenderViewHost::BlockExtensionRequest(int request_id) { |
1495 SendExtensionResponse(request_id, false, "", | 1496 SendExtensionResponse(request_id, false, "", |
1496 "Access to extension API denied."); | 1497 "Access to extension API denied."); |
1497 } | 1498 } |
1498 | 1499 |
1499 void RenderViewHost::UpdateBrowserWindowId(int window_id) { | 1500 void RenderViewHost::UpdateBrowserWindowId(int window_id) { |
1500 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id)); | 1501 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id)); |
1501 } | 1502 } |
1502 | 1503 |
1503 void RenderViewHost::PerformCustomContextMenuAction(unsigned action) { | 1504 void RenderViewHost::PerformCustomContextMenuAction( |
1504 Send(new ViewMsg_CustomContextMenuAction(routing_id(), action)); | 1505 const webkit_glue::CustomContextMenuContext& custom_context, |
| 1506 unsigned action) { |
| 1507 Send(new ViewMsg_CustomContextMenuAction(routing_id(), |
| 1508 custom_context, |
| 1509 action)); |
1505 } | 1510 } |
1506 | 1511 |
1507 void RenderViewHost::SendContentSettings(const GURL& url, | 1512 void RenderViewHost::SendContentSettings(const GURL& url, |
1508 const ContentSettings& settings) { | 1513 const ContentSettings& settings) { |
1509 Send(new ViewMsg_SetContentSettingsForCurrentURL(url, settings)); | 1514 Send(new ViewMsg_SetContentSettingsForCurrentURL(url, settings)); |
1510 } | 1515 } |
1511 | 1516 |
1512 void RenderViewHost::EnablePreferredSizeChangedMode(int flags) { | 1517 void RenderViewHost::EnablePreferredSizeChangedMode(int flags) { |
1513 Send(new ViewMsg_EnablePreferredSizeChangedMode(routing_id(), flags)); | 1518 Send(new ViewMsg_EnablePreferredSizeChangedMode(routing_id(), flags)); |
1514 } | 1519 } |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1726 if (printer_query.get()) { | 1731 if (printer_query.get()) { |
1727 BrowserThread::PostTask( | 1732 BrowserThread::PostTask( |
1728 BrowserThread::IO, FROM_HERE, | 1733 BrowserThread::IO, FROM_HERE, |
1729 NewRunnableMethod(printer_query.get(), | 1734 NewRunnableMethod(printer_query.get(), |
1730 &printing::PrinterQuery::StopWorker)); | 1735 &printing::PrinterQuery::StopWorker)); |
1731 } | 1736 } |
1732 | 1737 |
1733 // Send the printingDone msg for now. | 1738 // Send the printingDone msg for now. |
1734 Send(new ViewMsg_PrintingDone(routing_id(), params.document_cookie, true)); | 1739 Send(new ViewMsg_PrintingDone(routing_id(), params.document_cookie, true)); |
1735 } | 1740 } |
OLD | NEW |