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

Unified Diff: content/browser/child_process_security_policy_impl.cc

Issue 11273049: Revert 164120 - content/browser: Move more files into the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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
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
« no previous file with comments | « content/browser/child_process_security_policy_impl.h ('k') | content/browser/child_process_security_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698