summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/extensions
diff options
context:
space:
mode:
authormhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 14:09:27 +0000
committermhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 14:09:27 +0000
commit9e5be41af9f9946ae195920c13a6cdebddc989c2 (patch)
tree1b39d0900c7b463e43bf2ef5f381bf2610bc5da2 /chrome/renderer/extensions
parent762a91816bcce1e9d406251ec0db132e645bacad (diff)
downloadchromium_src-9e5be41af9f9946ae195920c13a6cdebddc989c2.zip
chromium_src-9e5be41af9f9946ae195920c13a6cdebddc989c2.tar.gz
chromium_src-9e5be41af9f9946ae195920c13a6cdebddc989c2.tar.bz2
TBR: darin
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions')
-rw-r--r--chrome/renderer/extensions/extension_process_bindings.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 9641c23..50f596e0 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -27,7 +27,6 @@
#include "webkit/api/public/WebFrame.h"
#include "webkit/api/public/WebURL.h"
#include "webkit/api/public/WebKit.h"
-#include "webkit/api/public/WebSecurityPolicy.h"
using bindings_utils::GetStringResource;
using bindings_utils::ContextInfo;
@@ -38,7 +37,6 @@ using bindings_utils::PendingRequest;
using bindings_utils::PendingRequestMap;
using bindings_utils::ExtensionBase;
using WebKit::WebFrame;
-using WebKit::WebSecurityPolicy;
using WebKit::WebView;
namespace {
@@ -547,7 +545,7 @@ void ExtensionProcessBindings::SetHostPermissions(
const GURL& extension_url,
const std::vector<URLPattern>& permissions) {
for (size_t i = 0; i < permissions.size(); ++i) {
- WebSecurityPolicy::whiteListAccessFromOrigin(
+ WebKit::whiteListAccessFromOrigin(
extension_url,
WebKit::WebString::fromUTF8(permissions[i].scheme()),
WebKit::WebString::fromUTF8(permissions[i].host()),