summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 21:48:10 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 21:48:10 +0000
commit51bcfbee3c3bd6509e3a8123db739d2f5b09fcd1 (patch)
treee93e38c0c421e627c711b59486654c0743a3184f /webkit/glue
parent5f86281ede483c8ba68d80055e48c3fd718ed5ca (diff)
downloadchromium_src-51bcfbee3c3bd6509e3a8123db739d2f5b09fcd1.zip
chromium_src-51bcfbee3c3bd6509e3a8123db739d2f5b09fcd1.tar.gz
chromium_src-51bcfbee3c3bd6509e3a8123db739d2f5b09fcd1.tar.bz2
TBR: Revert "Miscellaneous API sprucing."
This reverts commit 052b8f424d1550deebf3dc562d7c47dde72d7f76. Review URL: http://codereview.chromium.org/78001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webview.h6
-rw-r--r--webkit/glue/webview_impl.cc8
-rw-r--r--webkit/glue/webview_impl.h1
3 files changed, 0 insertions, 15 deletions
diff --git a/webkit/glue/webview.h b/webkit/glue/webview.h
index 3ecafc0..99ad41e 100644
--- a/webkit/glue/webview.h
+++ b/webkit/glue/webview.h
@@ -102,12 +102,6 @@ class WebView : public WebWidget {
// ---- TODO(darin): remove from here ----
- // TODO(mpcomplete): remove this before Chrome extensions ship.
- // HACK. This is a temporary workaround to allow cross-origin XHR for
- // Chrome extensions. It allows no fine-grained control over what origins
- // are accessible, instead granting access to everything (include file URLs).
- virtual void AllowCrossOriginAccessHack() = 0;
-
//
// - (IBAction)stopLoading:(id)sender;
virtual void StopLoading() = 0;
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index e19f16c..ce6d05d 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -342,8 +342,6 @@ WebView* WebView::Create(WebViewDelegate* delegate,
new WebDevToolsAgentImpl(instance, tools_delegate));
}
- instance->page_->settings()->setWebSecurityEnabled(false);
-
// Restrict the access to the local file system
// (see WebView.mm WebView::_commonInitializationWithFrameName).
FrameLoader::setLocalLoadPolicy(
@@ -397,12 +395,6 @@ WebViewImpl::~WebViewImpl() {
}
}
-void WebViewImpl::AllowCrossOriginAccessHack() {
- DCHECK(page_.get());
- if (page_.get())
- page_->settings()->setWebSecurityEnabled(false);
-}
-
void WebViewImpl::SetUseEditorDelegate(bool value) {
ASSERT(page_ != 0); // The macro doesn't like (!page_) with a scoped_ptr.
ASSERT(page_->editorClient());
diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h
index 69338c8..c0ce294 100644
--- a/webkit/glue/webview_impl.h
+++ b/webkit/glue/webview_impl.h
@@ -54,7 +54,6 @@ class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> {
virtual bool ShouldClose();
virtual void Close();
virtual WebViewDelegate* GetDelegate();
- virtual void AllowCrossOriginAccessHack();
virtual void SetDelegate(WebViewDelegate*);
virtual void SetUseEditorDelegate(bool value);
virtual void SetTabKeyCyclesThroughElements(bool value);