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

Unified Diff: chrome/browser/ui/webui/options2/content_settings_handler2.cc

Issue 10675007: 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 again 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
« no previous file with comments | « chrome/browser/ui/webui/ntp/app_launcher_handler.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options2/content_settings_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.cc b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
index 3285aeda7d7f63af7fa980eeec53fa2388036d03..30c26118b7e870f3e385629d09b42a1616d9083b 100644
--- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc
+++ b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
@@ -28,7 +28,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/content_settings.h"
#include "chrome/common/content_settings_pattern.h"
-#include "chrome/common/extensions/extension_permission_set.h"
+#include "chrome/common/extensions/permissions/api_permission.h"
#include "chrome/common/extensions/extension_set.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
@@ -48,6 +48,7 @@
#endif
using content::UserMetricsAction;
+using extensions::APIPermission;
namespace {
@@ -188,7 +189,7 @@ bool HasProtectedStorage(const extensions::Extension& app, Profile* profile) {
// Returns true whenever the |extension| is hosted and has |permission|.
// Must have the AppFilter signature.
-template <ExtensionAPIPermission::ID permission>
+template <APIPermission::ID permission>
bool HostedAppHasPermission(
const extensions::Extension& extension, Profile* /*profile*/) {
return extension.is_hosted_app() && extension.HasAPIPermission(permission);
@@ -743,7 +744,7 @@ void ContentSettingsHandler::UpdateGeolocationExceptionsView() {
ListValue exceptions;
AddExceptionsGrantedByHostedApps(
profile,
- HostedAppHasPermission<ExtensionAPIPermission::kGeolocation>,
+ HostedAppHasPermission<APIPermission::kGeolocation>,
&exceptions);
for (AllPatternsSettings::iterator i = all_patterns_settings.begin();
@@ -796,7 +797,7 @@ void ContentSettingsHandler::UpdateNotificationExceptionsView() {
ListValue exceptions;
AddExceptionsGrantedByHostedApps(profile,
- HostedAppHasPermission<ExtensionAPIPermission::kNotification>,
+ HostedAppHasPermission<APIPermission::kNotification>,
&exceptions);
for (ContentSettingsForOneType::const_iterator i =
« no previous file with comments | « chrome/browser/ui/webui/ntp/app_launcher_handler.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698