summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 15:02:53 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 15:02:53 +0000
commit9f005fe34de31a4db2e5e71c1780681cf8e81f6d (patch)
treed05519124cbcb006311f551a7c23575c5545c8b0 /chrome/browser/automation
parent115db1d73d21e02b498a8fe369f02fdca93bb2db (diff)
downloadchromium_src-9f005fe34de31a4db2e5e71c1780681cf8e81f6d.zip
chromium_src-9f005fe34de31a4db2e5e71c1780681cf8e81f6d.tar.gz
chromium_src-9f005fe34de31a4db2e5e71c1780681cf8e81f6d.tar.bz2
Revert 44351 - Reland 44348 Add support for restricting broadcasting events to extensions based on host permissions
BUG=38398 TEST=none TBR=jochen@chromium.org Review URL: http://codereview.chromium.org/1642005 TBR=jochen@chromium.org Review URL: http://codereview.chromium.org/1521027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_provider.cc2
-rw-r--r--chrome/browser/automation/extension_port_container.cc5
-rw-r--r--chrome/browser/automation/extension_port_container.h6
3 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index e6a0360..1aac1b1 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(), GURL());
+ event_name, json_args, profile()->IsOffTheRecord());
}
return true;
diff --git a/chrome/browser/automation/extension_port_container.cc b/chrome/browser/automation/extension_port_container.cc
index e93f42c..e167e7e 100644
--- a/chrome/browser/automation/extension_port_container.cc
+++ b/chrome/browser/automation/extension_port_container.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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,8 +114,7 @@ bool ExtensionPortContainer::Send(IPC::Message *message) {
void ExtensionPortContainer::OnExtensionMessageInvoke(
const std::string& function_name,
const ListValue& args,
- bool requires_incognito_access,
- const GURL& event_url) {
+ bool requires_incognito_access) {
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 8fd8299..b74709d 100644
--- a/chrome/browser/automation/extension_port_container.h
+++ b/chrome/browser/automation/extension_port_container.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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,7 +13,6 @@
class AutomationProvider;
class ExtensionMessageService;
-class GURL;
class ListValue;
class MessageLoop;
class RenderViewHost;
@@ -65,8 +64,7 @@ class ExtensionPortContainer : public IPC::Message::Sender {
void OnExtensionMessageInvoke(const std::string& function_name,
const ListValue& args,
- bool requires_incognito_access,
- const GURL& event_url);
+ bool requires_incognito_access);
void OnExtensionHandleMessage(const std::string& message, int source_port_id);
void OnExtensionPortDisconnected(int source_port_id);