fixup after rebase

electron · May 17, 2022 · c45e720 · c45e720
1 parent 594a851
commit c45e720
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
@@ -47,7 +47,6 @@
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -3450,7 +3449,7 @@ v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
 void WebContents::GrantDevicePermission(
     const url::Origin& origin,
     const base::Value* device,
-    blink::PermissionType permissionType,
+    blink::PermissionType permission_type,
     content::RenderFrameHost* render_frame_host) {
   granted_devices_[render_frame_host->GetFrameTreeNodeId()][permission_type]
                   [origin]
@@ -3461,7 +3460,7 @@ void WebContents::GrantDevicePermission(
 void WebContents::RevokeDevicePermission(
     const url::Origin& origin,
     const base::Value* device,
-    blink::PermissionType permissionType,
+    blink::PermissionType permission_type,
     content::RenderFrameHost* render_frame_host) {
   const auto& devices_for_frame_host_it =
       granted_devices_.find(render_frame_host->GetFrameTreeNodeId());

diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc
@@ -246,8 +246,8 @@ void WebContentsPermissionHelper::RevokeHIDDevicePermission(
     base::Value device,
     content::RenderFrameHost* render_frame_host) const {
   return RevokeDevicePermission(
-      static_cast<blink::PermissionType>(PermissionType::HID), origin,
-      &device, render_frame_host);
+      static_cast<blink::PermissionType>(PermissionType::HID), origin, &device,
+      render_frame_host);
 }
 
 WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsPermissionHelper);