summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 19:31:40 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 19:31:40 +0000
commit79e6a403ab654bcacc8b8cfff74514e06417f4ad (patch)
tree65ce1c86d64eadfee67b272651627755cf8cd2f6 /webkit/glue
parent5ead1637bd35e7c242f21ea212e3b494ad0facdc (diff)
downloadchromium_src-79e6a403ab654bcacc8b8cfff74514e06417f4ad.zip
chromium_src-79e6a403ab654bcacc8b8cfff74514e06417f4ad.tar.gz
chromium_src-79e6a403ab654bcacc8b8cfff74514e06417f4ad.tar.bz2
Rename policy_url to first_party_for_cookies in cookie-related code.
R=abarth BUG=25133 TEST=none. A cosmetic change. Review URL: http://codereview.chromium.org/403011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/plugins/plugin_host.cc3
-rw-r--r--webkit/glue/unittest_test_server.h2
-rw-r--r--webkit/glue/webkitclient_impl.cc2
-rw-r--r--webkit/glue/webkitclient_impl.h2
-rw-r--r--webkit/glue/webplugin.h4
-rw-r--r--webkit/glue/webplugin_impl.cc10
-rw-r--r--webkit/glue/webplugin_impl.h4
7 files changed, 15 insertions, 12 deletions
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index 256716f..7abe811 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -1040,7 +1040,8 @@ NPError NPN_GetValueForURL(NPP id,
if (!webplugin)
return NPERR_GENERIC_ERROR;
- // Bypass third-party cookie blocking by using the url as the policy_url.
+ // Bypass third-party cookie blocking by using the url as the
+ // first_party_for_cookies.
GURL cookies_url((std::string(url)));
result = webplugin->GetCookies(cookies_url, cookies_url);
break;
diff --git a/webkit/glue/unittest_test_server.h b/webkit/glue/unittest_test_server.h
index 139909e..44caa29 100644
--- a/webkit/glue/unittest_test_server.h
+++ b/webkit/glue/unittest_test_server.h
@@ -38,7 +38,7 @@ class UnittestTestServer : public HTTPTestServer {
scoped_ptr<ResourceLoaderBridge> loader(
ResourceLoaderBridge::Create("GET",
url,
- url, // policy_url
+ url, // first_party_for_cookies
GURL(), // no referrer
std::string(), // no extra headers
"null", // frame_origin
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 6d29eb1..a77e8d1 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -118,7 +118,7 @@ WebThemeEngine* WebKitClientImpl::themeEngine() {
}
bool WebKitClientImpl::rawCookies(const WebURL& url,
- const WebURL& policy_url,
+ const WebURL& first_party_for_cookies,
WebVector<WebCookie>* raw_cookies) {
NOTREACHED();
return false;
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 4791d64..16b4c67 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -51,7 +51,7 @@ class WebKitClientImpl : public WebKit::WebKitClient {
const WebKit::WebURL& url);
virtual size_t memoryUsageMB();
virtual bool rawCookies(const WebKit::WebURL& url,
- const WebKit::WebURL& policy_url,
+ const WebKit::WebURL& first_party_for_cookies,
WebKit::WebVector<WebKit::WebCookie>*);
virtual void deleteCookie(const WebKit::WebURL& url,
const WebKit::WebString& cookie_name);
diff --git a/webkit/glue/webplugin.h b/webkit/glue/webplugin.h
index b301dde..194b99d 100644
--- a/webkit/glue/webplugin.h
+++ b/webkit/glue/webplugin.h
@@ -79,10 +79,10 @@ class WebPlugin {
// Cookies
virtual void SetCookie(const GURL& url,
- const GURL& policy_url,
+ const GURL& first_party_for_cookies,
const std::string& cookie) = 0;
virtual std::string GetCookies(const GURL& url,
- const GURL& policy_url) = 0;
+ const GURL& first_party_for_cookies) = 0;
// Shows a modal HTML dialog containing the given URL. json_arguments are
// passed to the dialog via the DOM 'window.chrome.dialogArguments', and the
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 37f34c2..3b327b3 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -557,14 +557,16 @@ NPObject* WebPluginImpl::GetPluginElement() {
}
void WebPluginImpl::SetCookie(const GURL& url,
- const GURL& policy_url,
+ const GURL& first_party_for_cookies,
const std::string& cookie) {
WebKit::webKitClient()->setCookies(
- url, policy_url, WebString::fromUTF8(cookie));
+ url, first_party_for_cookies, WebString::fromUTF8(cookie));
}
-std::string WebPluginImpl::GetCookies(const GURL& url, const GURL& policy_url) {
- return UTF16ToUTF8(WebKit::webKitClient()->cookies(url, policy_url));
+std::string WebPluginImpl::GetCookies(const GURL& url,
+ const GURL& first_party_for_cookies) {
+ return UTF16ToUTF8(WebKit::webKitClient()->cookies(url,
+ first_party_for_cookies));
}
void WebPluginImpl::ShowModalHTMLDialog(const GURL& url, int width, int height,
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h
index 5bbc39f..af0d021 100644
--- a/webkit/glue/webplugin_impl.h
+++ b/webkit/glue/webplugin_impl.h
@@ -137,10 +137,10 @@ class WebPluginImpl : public WebPlugin,
NPObject* GetPluginElement();
void SetCookie(const GURL& url,
- const GURL& policy_url,
+ const GURL& first_party_for_cookies,
const std::string& cookie);
std::string GetCookies(const GURL& url,
- const GURL& policy_url);
+ const GURL& first_party_for_cookies);
void ShowModalHTMLDialog(const GURL& url, int width, int height,
const std::string& json_arguments,