Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: content/browser/child_process_security_policy.cc

Issue 9146028: Define the public interface for content browser SiteInstance. This interface is implemented by th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browsing_instance.cc ('k') | content/browser/debugger/render_view_devtools_agent_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/child_process_security_policy.cc
===================================================================
--- content/browser/child_process_security_policy.cc (revision 118952)
+++ content/browser/child_process_security_policy.cc (working copy)
@@ -10,13 +10,15 @@
#include "base/platform_file.h"
#include "base/stl_util.h"
#include "base/string_util.h"
+#include "content/browser/site_instance_impl.h"
#include "content/public/browser/content_browser_client.h"
-#include "content/browser/site_instance.h"
#include "content/public/common/bindings_policy.h"
#include "content/public/common/url_constants.h"
#include "googleurl/src/gurl.h"
#include "net/url_request/url_request.h"
+using content::SiteInstance;
+
static const int kReadFilePermissions =
base::PLATFORM_FILE_OPEN |
base::PLATFORM_FILE_READ |
@@ -103,7 +105,7 @@
bool CanUseCookiesForOrigin(const GURL& gurl) {
if (origin_lock_.is_empty())
return true;
- GURL site_gurl = SiteInstance::GetSiteForURL(NULL, gurl);
+ GURL site_gurl = SiteInstanceImpl::GetSiteForURL(NULL, gurl);
return origin_lock_ == site_gurl;
}
@@ -478,7 +480,7 @@
void ChildProcessSecurityPolicy::LockToOrigin(int child_id, const GURL& gurl) {
// "gurl" can be currently empty in some cases, such as file://blah.
- DCHECK(SiteInstance::GetSiteForURL(NULL, gurl) == gurl);
+ DCHECK(SiteInstanceImpl::GetSiteForURL(NULL, gurl) == gurl);
base::AutoLock lock(lock_);
SecurityStateMap::iterator state = security_state_.find(child_id);
DCHECK(state != security_state_.end());
« no previous file with comments | « content/browser/browsing_instance.cc ('k') | content/browser/debugger/render_view_devtools_agent_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698