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

Lines should be <= 80 characters.

Browse source
This commit is contained in:
Haojian Wu 2017-03-31 20:09:13 +02:00
parent 328cf4789b
commit 8ae91682cb
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
atom/browser/api/atom_api_dialog.cc
View file

@ -78,13 +78,14 @@ void ShowMessageBox(int type,
if (mate::Converter<atom::MessageBoxCallback>::FromV8(args->isolate(), if (mate::Converter<atom::MessageBoxCallback>::FromV8(args->isolate(),
peek, peek,
&callback)) { &callback)) {
atom::ShowMessageBox(window, static_cast<atom::MessageBoxType>(type), buttons, atom::ShowMessageBox(window, static_cast<atom::MessageBoxType>(type),
default_id, cancel_id, options, title, message, detail, buttons, default_id, cancel_id, options, title,
checkbox_label, checkbox_checked, icon, callback); message, detail, checkbox_label, checkbox_checked,
icon, callback);
} else { } else {
int chosen = atom::ShowMessageBox(window, static_cast<atom::MessageBoxType>(type), int chosen = atom::ShowMessageBox(
buttons, default_id, cancel_id, window, static_cast<atom::MessageBoxType>(type), buttons, default_id,
options, title, message, detail, icon); cancel_id, options, title, message, detail, icon);
args->Return(chosen); args->Return(chosen);
} }
} }

15
atom/browser/web_contents_permission_helper.cc
View file

@ -66,7 +66,8 @@ void WebContentsPermissionHelper::RequestPermission(
void WebContentsPermissionHelper::RequestFullscreenPermission( void WebContentsPermissionHelper::RequestFullscreenPermission(
const base::Callback<void(bool)>& callback) { const base::Callback<void(bool)>& callback) {
RequestPermission(static_cast<content::PermissionType>(PermissionType::FULLSCREEN), RequestPermission(
static_cast<content::PermissionType>(PermissionType::FULLSCREEN),
callback); callback);
} }
@ -86,17 +87,17 @@ void WebContentsPermissionHelper::RequestWebNotificationPermission(
void WebContentsPermissionHelper::RequestPointerLockPermission( void WebContentsPermissionHelper::RequestPointerLockPermission(
bool user_gesture) { bool user_gesture) {
RequestPermission(static_cast<content::PermissionType>(PermissionType::POINTER_LOCK), RequestPermission(
base::Bind(&OnPointerLockResponse, web_contents_), static_cast<content::PermissionType>(PermissionType::POINTER_LOCK),
user_gesture); base::Bind(&OnPointerLockResponse, web_contents_), user_gesture);
} }
void WebContentsPermissionHelper::RequestOpenExternalPermission( void WebContentsPermissionHelper::RequestOpenExternalPermission(
const base::Callback<void(bool)>& callback, const base::Callback<void(bool)>& callback,
bool user_gesture) { bool user_gesture) {
RequestPermission(static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL), RequestPermission(
callback, static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL),
user_gesture); callback, user_gesture);
} }
} // namespace atom } // namespace atom

6
atom/common/native_mate_converters/content_converter.cc
View file

@ -170,9 +170,11 @@ v8::Local<v8::Value> Converter<content::PermissionType>::ToV8(
if (val == static_cast<content::PermissionType>(PermissionType::POINTER_LOCK)) if (val == static_cast<content::PermissionType>(PermissionType::POINTER_LOCK))
return StringToV8(isolate, "pointerLock"); return StringToV8(isolate, "pointerLock");
else if (val == static_cast<content::PermissionType>(PermissionType::FULLSCREEN)) else if (val ==
static_cast<content::PermissionType>(PermissionType::FULLSCREEN))
return StringToV8(isolate, "fullscreen"); return StringToV8(isolate, "fullscreen");
else if (val == static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL)) else if (val ==
static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL))
return StringToV8(isolate, "openExternal"); return StringToV8(isolate, "openExternal");
return StringToV8(isolate, "unknown"); return StringToV8(isolate, "unknown");