Replace all enums with enum classes in permissions code.

chrome/browser/permissions/permission_queue_controller.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/permissions/permission_queue_controller.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 207 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   PermissionRequestType request_type =
       PermissionUtil::GetRequestType(content_settings_type_);
   PermissionRequestGestureType gesture_type =
       PermissionUtil::GetGestureType(user_gesture);
   PermissionEmbargoStatus embargo_status =
       PermissionEmbargoStatus::NOT_EMBARGOED;
 
   switch (decision) {
-    case GRANTED:
+    case PermissionAction::GRANTED:
       PermissionUmaUtil::PermissionGranted(content_settings_type_, gesture_type,
                                            requesting_frame, profile_);
       PermissionUmaUtil::RecordPermissionPromptAccepted(request_type,
                                                         gesture_type);
       break;
-    case DENIED:
+    case PermissionAction::DENIED:
       PermissionUmaUtil::PermissionDenied(content_settings_type_, gesture_type,
                                           requesting_frame, profile_);
       PermissionUmaUtil::RecordPermissionPromptDenied(request_type,
                                                       gesture_type);
       break;
-    case DISMISSED:
+    case PermissionAction::DISMISSED:
       PermissionUmaUtil::PermissionDismissed(
           content_settings_type_, gesture_type, requesting_frame, profile_);
       if (PermissionDecisionAutoBlocker::GetForProfile(profile_)
               ->RecordDismissAndEmbargo(requesting_frame,
                                         content_settings_type_)) {
         embargo_status = PermissionEmbargoStatus::REPEATED_DISMISSALS;
       }
       break;
     default:
       NOTREACHED();
@@ skipping 38 matching lines @@
   for (PendingInfobarRequests::iterator i = infobars_to_remove.begin();
        i != infobars_to_remove.end(); ++i)
     GetInfoBarService(i->id())->RemoveInfoBar(i->infobar());
 
   // PermissionContextBase needs to know about the new ContentSetting value,
   // CONTENT_SETTING_DEFAULT being the value for nothing happened. The callers
   // of ::OnPermissionSet passes { bool, GRANTED } for allow, { bool, DENIED }
   // for block and { false, DISMISSED } for dismissed. The tuple being
   // { update_content_setting, decision }.
   ContentSetting content_setting = CONTENT_SETTING_DEFAULT;
-  if (decision == GRANTED)
+  if (decision == PermissionAction::GRANTED)
     content_setting = CONTENT_SETTING_ALLOW;
-  else if (decision == DENIED)
+  else if (decision == PermissionAction::DENIED)
     content_setting = CONTENT_SETTING_BLOCK;
   else
-    DCHECK_EQ(DISMISSED, decision);
+    DCHECK_EQ(PermissionAction::DISMISSED, decision);
 
   // Send out the permission notifications.
   for (PendingInfobarRequests::iterator i = requests_to_notify.begin();
        i != requests_to_notify.end(); ++i) {
     i->RunCallback(content_setting);
   }
 
   // Remove the pending requests in reverse order.
   for (int i = pending_requests_to_remove.size() - 1; i >= 0; --i)
     pending_infobar_requests_.erase(pending_requests_to_remove[i]);
@@ skipping 110 matching lines @@
     registrar_.Remove(this,
                       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                       content::Source<InfoBarService>(infobar_service));
   }
 }
 
 void PermissionQueueController::UpdateContentSetting(
     const GURL& requesting_frame,
     const GURL& embedder,
     PermissionAction decision) {
-  DCHECK(decision == GRANTED || decision == DENIED);
+  DCHECK(decision == PermissionAction::GRANTED ||
+         decision == PermissionAction::DENIED);
   if (requesting_frame.GetOrigin().SchemeIsFile()) {
     // Chrome can be launched with --disable-web-security which allows
     // geolocation requests from file:// URLs. We don't want to store these
     // in the host content settings map.
     return;
   }
 
-  ContentSetting content_setting =
-      (decision == GRANTED) ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
+  ContentSetting content_setting = (decision == PermissionAction::GRANTED)
+                                       ? CONTENT_SETTING_ALLOW
+                                       : CONTENT_SETTING_BLOCK;
 
   // TODO(timloh): Remove this logic when push and notification permissions
   // are reconciled, see crbug.com/563297.
   ContentSettingsType type_for_map = content_settings_type_;
   if (type_for_map == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING)
     type_for_map = CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
   HostContentSettingsMapFactory::GetForProfile(profile_)
       ->SetContentSettingDefaultScope(
           requesting_frame.GetOrigin(), embedder.GetOrigin(),
           type_for_map, std::string(), content_setting);
 }