diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 21:17:49 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 21:17:49 +0000 |
| commit | 4b5d64ff3d7d95247ed4f078d8bf585a1726794d (patch) | |
| tree | 050a523a5bbccf28ade0814b38bcc9bee187cd04 /chrome/browser/renderer_host/render_view_host.cc | |
| parent | 912445b6db66140aecb3bc822075a6e9bb9d7e33 (diff) | |
| download | chromium_src-4b5d64ff3d7d95247ed4f078d8bf585a1726794d.zip chromium_src-4b5d64ff3d7d95247ed4f078d8bf585a1726794d.tar.gz chromium_src-4b5d64ff3d7d95247ed4f078d8bf585a1726794d.tar.bz2 | |
Pass down the opener tab when a message channel is opened to an extension.
Also did a bunch of cleanup of ExtensionMessageService. I converted it to
primarily UI-thread habitation, with one function that needs to be on the IO
thread so it can handle a synchronous IPC message.
TEST=N/A
Review URL: http://codereview.chromium.org/99261
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/render_view_host.cc')
| -rw-r--r-- | chrome/browser/renderer_host/render_view_host.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 3646358..c3d7aeb 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -15,8 +15,9 @@ #include "chrome/browser/cross_site_request_manager.h" #include "chrome/browser/debugger/debugger_wrapper.h" #include "chrome/browser/debugger/devtools_manager.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/metrics/user_metrics.h" +#include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/renderer_security_policy.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" @@ -26,13 +27,13 @@ #include "chrome/browser/tab_contents/site_instance.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/bindings_policy.h" -#include "chrome/common/render_messages.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#include "chrome/common/render_messages.h" +#include "chrome/common/resource_bundle.h" #include "chrome/common/result_codes.h" -#include "chrome/common/url_constants.h" #include "chrome/common/thumbnail_score.h" +#include "chrome/common/url_constants.h" #include "net/base/net_util.h" #include "skia/include/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h" @@ -775,6 +776,8 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionChanged, OnMsgSelectionChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_PasteFromSelectionClipboard, OnMsgPasteFromSelectionClipboard) + IPC_MESSAGE_HANDLER(ViewHostMsg_ExtensionPostMessage, + OnExtensionPostMessage) // Have the super handle all other messages. IPC_MESSAGE_UNHANDLED(RenderWidgetHost::OnMessageReceived(msg)) IPC_END_MESSAGE_MAP_EX() @@ -1368,3 +1371,10 @@ void RenderViewHost::SendExtensionResponse(int callback_id, const std::string& response) { Send(new ViewMsg_ExtensionResponse(routing_id(), callback_id, response)); } + +void RenderViewHost::OnExtensionPostMessage( + int port_id, const std::string& message) { + URLRequestContext* context = process()->profile()->GetRequestContext(); + ExtensionMessageService::GetInstance(context)-> + PostMessageFromRenderer(port_id, message); +} |