Index: chrome/browser/permissions/permission_manager.cc |
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc |
index 9ccf74d6df5441d4a8844039e9ebd264015672b1..4d22f5e4f12d25a8deee946a8032055decaaa4cf 100644 |
--- a/chrome/browser/permissions/permission_manager.cc |
+++ b/chrome/browser/permissions/permission_manager.cc |
@@ -21,21 +21,20 @@ |
#include "chrome/browser/ui/website_settings/permission_bubble_manager.h" |
#endif |
-using content::PermissionStatus; |
using content::PermissionType; |
namespace { |
-// Helper method to convert ContentSetting to PermissionStatus. |
-PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) { |
+// Helper method to convert ContentSetting to permission::Status. |
+permission::Status ContentSettingToPermissionStatus(ContentSetting setting) { |
switch (setting) { |
case CONTENT_SETTING_ALLOW: |
case CONTENT_SETTING_SESSION_ONLY: |
- return content::PERMISSION_STATUS_GRANTED; |
+ return permission::STATUS_GRANTED; |
case CONTENT_SETTING_BLOCK: |
- return content::PERMISSION_STATUS_DENIED; |
+ return permission::STATUS_DENIED; |
case CONTENT_SETTING_ASK: |
- return content::PERMISSION_STATUS_ASK; |
+ return permission::STATUS_ASK; |
case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT: |
case CONTENT_SETTING_DEFAULT: |
case CONTENT_SETTING_NUM_SETTINGS: |
@@ -43,7 +42,7 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) { |
} |
NOTREACHED(); |
- return content::PERMISSION_STATUS_DENIED; |
+ return permission::STATUS_DENIED; |
} |
// Helper method to convert PermissionType to ContentSettingType. |
@@ -83,7 +82,7 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) { |
return CONTENT_SETTINGS_TYPE_DEFAULT; |
} |
-// Returns whether the permission has a constant PermissionStatus value (i.e. |
+// Returns whether the permission has a constant permission::Status value (i.e. |
// always approved or always denied) |
// The PermissionTypes for which true is returned should be exactly those which |
// return nullptr in PermissionContext::Get since they don't have a context. |
@@ -111,7 +110,8 @@ ContentSetting GetContentSettingForConstantPermission(PermissionType type) { |
} |
} |
-PermissionStatus GetPermissionStatusForConstantPermission(PermissionType type) { |
+permission::Status GetPermissionStatusForConstantPermission( |
+ PermissionType type) { |
return ContentSettingToPermissionStatus( |
GetContentSettingForConstantPermission(type)); |
} |
@@ -135,7 +135,7 @@ struct PermissionManager::Subscription { |
PermissionType permission; |
GURL requesting_origin; |
GURL embedding_origin; |
- base::Callback<void(PermissionStatus)> callback; |
+ base::Callback<void(permission::Status)> callback; |
ContentSetting current_value; |
}; |
@@ -155,7 +155,7 @@ int PermissionManager::RequestPermission( |
content::RenderFrameHost* render_frame_host, |
const GURL& requesting_origin, |
bool user_gesture, |
- const base::Callback<void(PermissionStatus)>& callback) { |
+ const base::Callback<void(permission::Status)>& callback) { |
if (IsConstantPermission(permission)) { |
callback.Run(GetPermissionStatusForConstantPermission(permission)); |
return kNoPendingOperation; |
@@ -163,7 +163,7 @@ int PermissionManager::RequestPermission( |
PermissionContextBase* context = PermissionContext::Get(profile_, permission); |
if (!context) { |
- callback.Run(content::PERMISSION_STATUS_DENIED); |
+ callback.Run(permission::STATUS_DENIED); |
return kNoPendingOperation; |
} |
@@ -194,7 +194,7 @@ int PermissionManager::RequestPermission( |
void PermissionManager::OnPermissionRequestResponse( |
int request_id, |
- const base::Callback<void(PermissionStatus)>& callback, |
+ const base::Callback<void(permission::Status)>& callback, |
ContentSetting content_setting) { |
pending_requests_.Remove(request_id); |
callback.Run(ContentSettingToPermissionStatus(content_setting)); |
@@ -236,7 +236,7 @@ void PermissionManager::ResetPermission(PermissionType permission, |
embedding_origin.GetOrigin()); |
} |
-PermissionStatus PermissionManager::GetPermissionStatus( |
+permission::Status PermissionManager::GetPermissionStatus( |
PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin) { |
@@ -245,7 +245,7 @@ PermissionStatus PermissionManager::GetPermissionStatus( |
PermissionContextBase* context = PermissionContext::Get(profile_, permission); |
if (!context) |
- return content::PERMISSION_STATUS_DENIED; |
+ return permission::STATUS_DENIED; |
return ContentSettingToPermissionStatus(context->GetPermissionStatus( |
requesting_origin.GetOrigin(), embedding_origin.GetOrigin())); |
@@ -269,7 +269,7 @@ int PermissionManager::SubscribePermissionStatusChange( |
PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin, |
- const base::Callback<void(PermissionStatus)>& callback) { |
+ const base::Callback<void(permission::Status)>& callback) { |
if (subscriptions_.IsEmpty()) |
HostContentSettingsMapFactory::GetForProfile(profile_)->AddObserver(this); |