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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 7003098: Start refractoring extension permissions into ExtensionPermissionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a bad merge Created 9 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 aa77ee2b7aebba34774fafe3f5490567ef64bdda..fedbce97c67b4cd2f0c82ce2af48797609346a1c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -398,7 +398,7 @@ WebKit::WebNotificationPresenter::Permission
const Extension* extension =
io_data->GetExtensionInfoMap()->extensions().GetByURL(source_url);
if (extension &&
- extension->HasApiPermission(Extension::kNotificationPermission)) {
+ extension->HasApiPermission(ExtensionAPIPermission::Notification())) {
return WebKit::WebNotificationPresenter::PermissionAllowed;
}
@@ -461,7 +461,7 @@ bool ChromeContentBrowserClient::CanCreateWindow(
const Extension* extension =
io_data->GetExtensionInfoMap()->extensions().GetByURL(source_url);
return (extension &&
- extension->HasApiPermission(Extension::kBackgroundPermission));
+ extension->HasApiPermission(ExtensionAPIPermission::Background()));
}
return true;
}

Powered by Google App Engine
This is Rietveld 408576698