mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Better field names for details object

Browse source
This commit is contained in:
Cheng Zhao 2017-12-20 10:25:31 +09:00
parent 4d7b85bd01
commit 4fd8b04329
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/web_contents_permission_helper.cc
View file

@ -69,8 +69,8 @@ void WebContentsPermissionHelper::RequestPermissionWithDetails(
web_contents_->GetBrowserContext()->GetPermissionManager());
auto origin = web_contents_->GetLastCommittedURL();
permission_manager->RequestPermissionWithDetails(
permission, rfh, origin, false, details,
base::Bind(&OnPermissionResponse, callback));
permission, rfh, origin, false, details,
base::Bind(&OnPermissionResponse, callback));
}
void WebContentsPermissionHelper::RequestFullscreenPermission(
@ -106,8 +106,7 @@ void WebContentsPermissionHelper::RequestOpenExternalPermission(
bool user_gesture,
const GURL& url) {
base::DictionaryValue details;
details.SetString("scheme", url.scheme());
details.SetString("url", url.spec());
details.SetString("externalURL", url.spec());
RequestPermissionWithDetails(
static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL),
callback, user_gesture, &details);

8
atom/browser/web_contents_permission_helper.h
View file

@ -45,10 +45,10 @@ class WebContentsPermissionHelper
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);
content::PermissionType permission,
const base::Callback<void(bool)>& callback,
bool user_gesture,
const base::DictionaryValue* details);
content::WebContents* web_contents_;