From 16fb38a8b87fe700645055e472d84de7aefe48a5 Mon Sep 17 00:00:00 2001
From: sammc <sammc@chromium.org>
Date: Wed, 20 Jan 2016 21:30:18 -0800
Subject: Change mojo enums to be scoped enums in the generated C++ bindings.

Some mojo enums were previously not proper enums: they were constants
for bitfields. These have been replaced by const int32s in the mojoms:
- mus.mojom.EventFlags
- mus.mojom.MouseEventFlags
- mus.mojom.ResizeBehavior
- mus.mojom.WindowTree.AccessPolicy

Some mojo enum values now conflict with macros (mostly on Windows) and
needed to change:
- mus.mojom.Cursor.NULL became CURSOR_NULL (again)
- mus.mojom.KeyboardCode.DELETE became DELETE_KEY
- mus.mojom.WindowManagerErrorCode.ERROR_ACCESS_DENIED became
  ACCESS_DENIED
- device.usb.TransferDirection.IN became INBOUND
- device.usb.TransferDirection.OUT became OUTBOUND
- device.usb.TransferStatus.ERROR became TRANSFER_ERROR
- device.NFCRecordType.OPAQUE became OPAQUE_RECORD
- media.interfaces.Decryptor.Status.ERROR became DECRYPTION_ERROR
- skia.AlphaType.OPAQUE became ALPHA_TYPE_OPAQUE

Review URL: https://codereview.chromium.org/1527183003

Cr-Commit-Position: refs/heads/master@{#370632}
---
 android_webview/browser/aw_permission_manager.cc | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'android_webview')

diff --git a/android_webview/browser/aw_permission_manager.cc b/android_webview/browser/aw_permission_manager.cc
index 5d9e7368..c7fe04d 100644
--- a/android_webview/browser/aw_permission_manager.cc
+++ b/android_webview/browser/aw_permission_manager.cc
@@ -28,8 +28,8 @@ class LastRequestResultCache {
                  const GURL& requesting_origin,
                  const GURL& embedding_origin,
                  PermissionStatus status) {
-    DCHECK(status == content::PERMISSION_STATUS_GRANTED ||
-           status == content::PERMISSION_STATUS_DENIED);
+    DCHECK(status == content::PermissionStatus::GRANTED ||
+           status == content::PermissionStatus::DENIED);
 
     // TODO(ddorwin): We should be denying empty origins at a higher level.
     if (requesting_origin.is_empty() || embedding_origin.is_empty()) {
@@ -66,7 +66,7 @@ class LastRequestResultCache {
                              const GURL& embedding_origin) const {
     // TODO(ddorwin): We should be denying empty origins at a higher level.
     if (requesting_origin.is_empty() || embedding_origin.is_empty()) {
-      return content::PERMISSION_STATUS_ASK;
+      return content::PermissionStatus::ASK;
     }
 
     DCHECK(requesting_origin.is_valid())
@@ -76,14 +76,14 @@ class LastRequestResultCache {
 
     if (permission != PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
       NOTREACHED() << "Results are only cached for PROTECTED_MEDIA_IDENTIFIER";
-      return content::PERMISSION_STATUS_ASK;
+      return content::PermissionStatus::ASK;
     }
 
     std::string key = GetCacheKey(requesting_origin, embedding_origin);
     StatusMap::const_iterator it = pmi_result_cache_.find(key);
     if (it == pmi_result_cache_.end()) {
       DLOG(WARNING) << "GetResult() called for uncached origins: " << key;
-      return content::PERMISSION_STATUS_ASK;
+      return content::PermissionStatus::ASK;
     }
 
     DCHECK(!key.empty());
@@ -179,7 +179,7 @@ int AwPermissionManager::RequestPermission(
   if (!delegate) {
     DVLOG(0) << "Dropping permission request for "
              << static_cast<int>(permission);
-    callback.Run(content::PERMISSION_STATUS_DENIED);
+    callback.Run(content::PermissionStatus::DENIED);
     return kNoPendingOperation;
   }
 
@@ -245,14 +245,14 @@ int AwPermissionManager::RequestPermission(
     case PermissionType::DURABLE_STORAGE:
       NOTIMPLEMENTED() << "RequestPermission is not implemented for "
                        << static_cast<int>(permission);
-      callback.Run(content::PERMISSION_STATUS_DENIED);
+      callback.Run(content::PermissionStatus::DENIED);
       break;
     case PermissionType::MIDI:
-      callback.Run(content::PERMISSION_STATUS_GRANTED);
+      callback.Run(content::PermissionStatus::GRANTED);
       break;
     case PermissionType::NUM:
       NOTREACHED() << "PermissionType::NUM was not expected here.";
-      callback.Run(content::PERMISSION_STATUS_DENIED);
+      callback.Run(content::PermissionStatus::DENIED);
       break;
   }
   return request_id;
@@ -287,8 +287,8 @@ void AwPermissionManager::OnRequestResponse(
     int request_id,
     const base::Callback<void(PermissionStatus)>& callback,
     bool allowed) {
-  PermissionStatus status = allowed ? content::PERMISSION_STATUS_GRANTED
-                                    : content::PERMISSION_STATUS_DENIED;
+  PermissionStatus status = allowed ? content::PermissionStatus::GRANTED
+                                    : content::PermissionStatus::DENIED;
   if (manager.get()) {
     PendingRequest* pending_request =
         manager->pending_requests_.Lookup(request_id);
@@ -391,10 +391,10 @@ PermissionStatus AwPermissionManager::GetPermissionStatus(
     return result_cache_->GetResult(permission, requesting_origin,
                                     embedding_origin);
   } else if (permission == PermissionType::MIDI) {
-    return content::PERMISSION_STATUS_GRANTED;
+    return content::PermissionStatus::GRANTED;
   }
 
-  return content::PERMISSION_STATUS_DENIED;
+  return content::PermissionStatus::DENIED;
 }
 
 void AwPermissionManager::RegisterPermissionUsage(
-- 
cgit v1.1