From b2e6340622b89c69dd677d394feb443237363d12 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 20 Dec 2017 10:49:49 +0900
Subject: [PATCH] Reduce the number of helpers
---
atom/browser/web_contents_permission_helper.cc | 9 +--------
atom/browser/web_contents_permission_helper.h | 8 ++------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/atom/browser/web_contents_permission_helper.cc b/atom/browser/web_contents_permission_helper.cc
index f363e2eb4067..2d85009c79a0 100644
--- a/atom/browser/web_contents_permission_helper.cc
+++ b/atom/browser/web_contents_permission_helper.cc
@@ -53,13 +53,6 @@ WebContentsPermissionHelper::~WebContentsPermissionHelper() {
}
void WebContentsPermissionHelper::RequestPermission(
- content::PermissionType permission,
- const base::Callback<void(bool)>& callback,
- bool user_gesture) {
- RequestPermissionWithDetails(permission, callback, user_gesture, nullptr);
-}
-
-void WebContentsPermissionHelper::RequestPermissionWithDetails(
content::PermissionType permission,
const base::Callback<void(bool)>& callback,
bool user_gesture,
@@ -107,7 +100,7 @@ void WebContentsPermissionHelper::RequestOpenExternalPermission(
const GURL& url) {
base::DictionaryValue details;
details.SetString("externalURL", url.spec());
- RequestPermissionWithDetails(
+ RequestPermission(
static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL),
callback, user_gesture, &details);
}
diff --git a/atom/browser/web_contents_permission_helper.h b/atom/browser/web_contents_permission_helper.h
index 49fa39e3866c..02879c68e364 100644
--- a/atom/browser/web_contents_permission_helper.h
+++ b/atom/browser/web_contents_permission_helper.h
@@ -43,12 +43,8 @@ class WebContentsPermissionHelper
void RequestPermission(
content::PermissionType permission,
const base::Callback<void(bool)>& callback,
- bool user_gesture = false);
- void RequestPermissionWithDetails(
- content::PermissionType permission,
- const base::Callback<void(bool)>& callback,
- bool user_gesture,
- const base::DictionaryValue* details);
+ bool user_gesture = false,
+ const base::DictionaryValue* details = nullptr);
content::WebContents* web_contents_;