diff options
| author | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 14:09:27 +0000 |
|---|---|---|
| committer | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 14:09:27 +0000 |
| commit | 9e5be41af9f9946ae195920c13a6cdebddc989c2 (patch) | |
| tree | 1b39d0900c7b463e43bf2ef5f381bf2610bc5da2 /chrome/renderer | |
| parent | 762a91816bcce1e9d406251ec0db132e645bacad (diff) | |
| download | chromium_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')
| -rw-r--r-- | chrome/renderer/extensions/extension_process_bindings.cc | 4 | ||||
| -rw-r--r-- | chrome/renderer/render_thread.cc | 10 |
2 files changed, 5 insertions, 9 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()), diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index e77e3af..3ccdd85 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -52,7 +52,6 @@ #include "webkit/api/public/WebColor.h" #include "webkit/api/public/WebKit.h" #include "webkit/api/public/WebScriptController.h" -#include "webkit/api/public/WebSecurityPolicy.h" #include "webkit/api/public/WebStorageEventDispatcher.h" #include "webkit/api/public/WebString.h" #include "webkit/extensions/v8/benchmarking_extension.h" @@ -69,7 +68,6 @@ using WebKit::WebCache; using WebKit::WebCrossOriginPreflightResultCache; using WebKit::WebFontCache; -using WebKit::WebSecurityPolicy; using WebKit::WebString; using WebKit::WebStorageEventDispatcher; using WebKit::WebView; @@ -448,13 +446,13 @@ void RenderThread::EnsureWebKitInitialized() { // also be unable to script anything but themselves (to help limit the damage // that a corrupt chrome: page could cause). WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme)); - WebSecurityPolicy::registerURLSchemeAsLocal(chrome_ui_scheme); - WebSecurityPolicy::registerURLSchemeAsNoAccess(chrome_ui_scheme); + WebKit::registerURLSchemeAsLocal(chrome_ui_scheme); + WebKit::registerURLSchemeAsNoAccess(chrome_ui_scheme); // print: pages should be not accessible by normal context. WebString print_ui_scheme(ASCIIToUTF16(chrome::kPrintScheme)); - WebSecurityPolicy::registerURLSchemeAsLocal(print_ui_scheme); - WebSecurityPolicy::registerURLSchemeAsNoAccess(print_ui_scheme); + WebKit::registerURLSchemeAsLocal(print_ui_scheme); + WebKit::registerURLSchemeAsNoAccess(print_ui_scheme); #if defined(OS_WIN) // We don't yet support Gears on non-Windows, so don't tell pages that we do. |