Index: content/browser/child_process_security_policy_impl.cc |
=================================================================== |
--- content/browser/child_process_security_policy_impl.cc (revision 164121) |
+++ content/browser/child_process_security_policy_impl.cc (working copy) |
@@ -19,7 +19,8 @@ |
#include "net/url_request/url_request.h" |
#include "webkit/fileapi/isolated_context.h" |
-namespace content { |
+using content::ChildProcessSecurityPolicy; |
+using content::SiteInstance; |
namespace { |
@@ -167,7 +168,7 @@ |
} |
bool has_web_ui_bindings() const { |
- return enabled_bindings_ & BINDINGS_POLICY_WEB_UI; |
+ return enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI; |
} |
bool can_read_raw_cookies() const { |
@@ -424,7 +425,7 @@ |
if (state == security_state_.end()) |
return; |
- state->second->GrantBindings(BINDINGS_POLICY_WEB_UI); |
+ state->second->GrantBindings(content::BINDINGS_POLICY_WEB_UI); |
// Web UI bindings need the ability to request chrome: URLs. |
state->second->GrantScheme(chrome::kChromeUIScheme); |
@@ -487,7 +488,7 @@ |
return false; |
} |
- if (!GetContentClient()->browser()->IsHandledURL(url) && |
+ if (!content::GetContentClient()->browser()->IsHandledURL(url) && |
!net::URLRequest::IsHandledURL(url)) { |
return true; // This URL request is destined for ShellExecute. |
} |
@@ -628,5 +629,3 @@ |
return false; |
return state->second->HasPermissionsForFileSystem(filesystem_id, permission); |
} |
- |
-} // namespace content |