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

Appease the linter

Browse source
This commit is contained in:
Samuel Attard 2017-11-11 14:44:57 +11:00 • committed by Cheng Zhao
parent 98e9311669
commit 4d7b85bd01
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/atom_permission_manager.cc
View file

@ -105,7 +105,7 @@ int AtomPermissionManager::RequestPermission(
nullptr, nullptr,
response_callback); response_callback);
} }
int AtomPermissionManager::RequestPermissionWithDetails( int AtomPermissionManager::RequestPermissionWithDetails(
content::PermissionType permission, content::PermissionType permission,
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
@ -173,7 +173,8 @@ int AtomPermissionManager::RequestPermissionsWithDetails(
base::Bind(&AtomPermissionManager::OnPermissionResponse, base::Bind(&AtomPermissionManager::OnPermissionResponse,
base::Unretained(this), request_id, i); base::Unretained(this), request_id, i);
if (details == nullptr) { if (details == nullptr) {
request_handler_.Run(web_contents, permission, callback, base::DictionaryValue()); request_handler_.Run(web_contents, permission, callback,
base::DictionaryValue());
} else { } else {
request_handler_.Run(web_contents, permission, callback, *details); request_handler_.Run(web_contents, permission, callback, *details);
} }

3
atom/browser/atom_resource_dispatcher_host_delegate.cc
View file

@ -61,7 +61,8 @@ void HandleExternalProtocolInUI(
GURL escaped_url(net::EscapeExternalHandlerValue(url.spec())); GURL escaped_url(net::EscapeExternalHandlerValue(url.spec()));
auto callback = base::Bind(&OnOpenExternal, escaped_url); auto callback = base::Bind(&OnOpenExternal, escaped_url);
permission_helper->RequestOpenExternalPermission(callback, has_user_gesture, url); permission_helper->RequestOpenExternalPermission(callback, has_user_gesture,
url);
} }
void OnPdfResourceIntercepted( void OnPdfResourceIntercepted(

2
atom/browser/web_contents_permission_helper.cc
View file

@ -58,7 +58,7 @@ void WebContentsPermissionHelper::RequestPermission(
bool user_gesture) { bool user_gesture) {
RequestPermissionWithDetails(permission, callback, user_gesture, nullptr); RequestPermissionWithDetails(permission, callback, user_gesture, nullptr);
} }
void WebContentsPermissionHelper::RequestPermissionWithDetails( void WebContentsPermissionHelper::RequestPermissionWithDetails(
content::PermissionType permission, content::PermissionType permission,
const base::Callback<void(bool)>& callback, const base::Callback<void(bool)>& callback,