diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-13 12:54:10 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-13 12:54:10 +0000 |
commit | 8426c02d403d815745650e6833b82f22050a1bb2 (patch) | |
tree | 85dcdd2979e2cf569c045ec589de17de7331f116 /chrome/browser/automation | |
parent | 16ca52db210a9c32244308eef74b0f4db01d9666 (diff) | |
download | chromium_src-8426c02d403d815745650e6833b82f22050a1bb2.zip chromium_src-8426c02d403d815745650e6833b82f22050a1bb2.tar.gz chromium_src-8426c02d403d815745650e6833b82f22050a1bb2.tar.bz2 |
Add support for restricting broadcasting events to extensions based on host permissions.
BUG=38398
TEST=none
Review URL: http://codereview.chromium.org/1095002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r-- | chrome/browser/automation/automation_provider.cc | 2 | ||||
-rw-r--r-- | chrome/browser/automation/extension_port_container.cc | 5 | ||||
-rw-r--r-- | chrome/browser/automation/extension_port_container.h | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 1aac1b1..e6a0360 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -2202,7 +2202,7 @@ bool AutomationProvider::InterceptBrowserEventMessageFromExternalHost( if (profile()->GetExtensionMessageService()) { profile()->GetExtensionMessageService()->DispatchEventToRenderers( - event_name, json_args, profile()->IsOffTheRecord()); + event_name, json_args, profile()->IsOffTheRecord(), GURL()); } return true; diff --git a/chrome/browser/automation/extension_port_container.cc b/chrome/browser/automation/extension_port_container.cc index e167e7e..e93f42c 100644 --- a/chrome/browser/automation/extension_port_container.cc +++ b/chrome/browser/automation/extension_port_container.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -114,7 +114,8 @@ bool ExtensionPortContainer::Send(IPC::Message *message) { void ExtensionPortContainer::OnExtensionMessageInvoke( const std::string& function_name, const ListValue& args, - bool requires_incognito_access) { + bool requires_incognito_access, + const GURL& event_url) { if (function_name == ExtensionMessageService::kDispatchOnMessage) { DCHECK_EQ(args.GetSize(), 2u); diff --git a/chrome/browser/automation/extension_port_container.h b/chrome/browser/automation/extension_port_container.h index b74709d..8fd8299 100644 --- a/chrome/browser/automation/extension_port_container.h +++ b/chrome/browser/automation/extension_port_container.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,6 +13,7 @@ class AutomationProvider; class ExtensionMessageService; +class GURL; class ListValue; class MessageLoop; class RenderViewHost; @@ -64,7 +65,8 @@ class ExtensionPortContainer : public IPC::Message::Sender { void OnExtensionMessageInvoke(const std::string& function_name, const ListValue& args, - bool requires_incognito_access); + bool requires_incognito_access, + const GURL& event_url); void OnExtensionHandleMessage(const std::string& message, int source_port_id); void OnExtensionPortDisconnected(int source_port_id); |