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

Unified Diff: chrome/browser/permissions/permission_manager.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase Created 4 years, 11 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/permissions/permission_manager.cc
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
index 44d97af007c0c7ee9fc73fe39cd36e14d97bb1ea..7a8652e3eec2dd8b20f828b5f0d4682f51fe5c65 100644
--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
@@ -34,11 +34,11 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) {
switch (setting) {
case CONTENT_SETTING_ALLOW:
case CONTENT_SETTING_SESSION_ONLY:
- return content::PERMISSION_STATUS_GRANTED;
+ return content::PermissionStatus::GRANTED;
case CONTENT_SETTING_BLOCK:
- return content::PERMISSION_STATUS_DENIED;
+ return content::PermissionStatus::DENIED;
case CONTENT_SETTING_ASK:
- return content::PERMISSION_STATUS_ASK;
+ return content::PermissionStatus::ASK;
case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
case CONTENT_SETTING_DEFAULT:
case CONTENT_SETTING_NUM_SETTINGS:
@@ -46,7 +46,7 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) {
}
NOTREACHED();
- return content::PERMISSION_STATUS_DENIED;
+ return content::PermissionStatus::DENIED;
}
// Wrap a callback taking a PermissionStatus to pass it as a callback taking a
@@ -140,15 +140,14 @@ class PermissionManager::PendingRequest {
public:
PendingRequest(content::RenderFrameHost* render_frame_host,
const std::vector<PermissionType> permissions,
- const base::Callback<void(
- const std::vector<PermissionStatus>&)>& callback)
- : render_process_id_(render_frame_host->GetProcess()->GetID()),
- render_frame_id_(render_frame_host->GetRoutingID()),
- callback_(callback),
- permissions_(permissions),
- results_(permissions.size(), content::PERMISSION_STATUS_DENIED),
- remaining_results_(permissions.size()) {
- }
+ const base::Callback<
+ void(const std::vector<PermissionStatus>&)>& callback)
+ : render_process_id_(render_frame_host->GetProcess()->GetID()),
+ render_frame_id_(render_frame_host->GetRoutingID()),
+ callback_(callback),
+ permissions_(permissions),
+ results_(permissions.size(), content::PermissionStatus::DENIED),
+ remaining_results_(permissions.size()) {}
void SetPermissionStatus(int permission_id, PermissionStatus status) {
DCHECK(!IsComplete());
@@ -328,7 +327,7 @@ PermissionStatus PermissionManager::GetPermissionStatus(
PermissionContextBase* context = PermissionContext::Get(profile_, permission);
if (!context)
- return content::PERMISSION_STATUS_DENIED;
+ return content::PermissionStatus::DENIED;
return ContentSettingToPermissionStatus(context->GetPermissionStatus(
requesting_origin.GetOrigin(), embedding_origin.GetOrigin()));

Powered by Google App Engine
This is Rietveld 408576698