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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 10649003: Move each permission classes to its own files in extensions/permissions (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase on HEAD Created 8 years, 6 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: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 15af384cf9585c2ac1c0df4e4d84d6ab638596a6..27ec3d7b33c4d9c2779043b2e40230c9d079cb12 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -135,6 +135,7 @@ using content::QuotaPermissionContext;
using content::RenderViewHost;
using content::SiteInstance;
using content::WebContents;
+using extensions::APIPermission;
using extensions::Extension;
using webkit_glue::WebPreferences;
@@ -496,7 +497,7 @@ bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
// page, we want to give each instance its own process to improve
// responsiveness.
if (extension->GetType() == Extension::TYPE_HOSTED_APP) {
- if (!extension->HasAPIPermission(ExtensionAPIPermission::kBackground) ||
+ if (!extension->HasAPIPermission(APIPermission::kBackground) ||
!extension->allow_background_js_access()) {
return false;
}
@@ -1158,7 +1159,7 @@ void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
service->extensions()->GetExtensionOrAppByURL(ExtensionURLInfo(
source_origin));
if (extension &&
- extension->HasAPIPermission(ExtensionAPIPermission::kNotification)) {
+ extension->HasAPIPermission(APIPermission::kNotification)) {
RenderViewHost* rvh =
RenderViewHost::FromID(render_process_id, render_view_id);
if (rvh)
@@ -1185,7 +1186,7 @@ WebKit::WebNotificationPresenter::Permission
ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
if (io_data->GetExtensionInfoMap()->SecurityOriginHasAPIPermission(
source_origin, render_process_id,
- ExtensionAPIPermission::kNotification))
+ APIPermission::kNotification))
return WebKit::WebNotificationPresenter::PermissionAllowed;
// Fall back to the regular notification preferences, which works on an
@@ -1267,7 +1268,7 @@ bool ChromeContentBrowserClient::CanCreateWindow(
if (!map->SecurityOriginHasAPIPermission(
source_origin,
render_process_id,
- ExtensionAPIPermission::kBackground)) {
+ APIPermission::kBackground)) {
return false;
}
@@ -1576,7 +1577,7 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI(
if (!extension)
return false;
- if (extension->HasAPIPermission(ExtensionAPIPermission::kSocket))
+ if (extension->HasAPIPermission(APIPermission::kSocket))
return true;
return false;

Powered by Google App Engine
This is Rietveld 408576698