github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-05 12:45:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

add fullscreen permission type

Browse Source
This commit is contained in:
Robo
2016-02-01 15:33:38 +05:30
parent 45eada306f
commit b575cd0ef9
6 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
atom/browser/api/atom_api_web_contents.cc
View File

@@ -390,6 +390,18 @@ void WebContents::HandleKeyboardEvent(
void WebContents::EnterFullscreenModeForTab(content::WebContents* source,
const GURL& origin) {
auto permission_helper =
WebContentsPermissionHelper::FromWebContents(source);
auto callback = base::Bind(&WebContents::OnEnterFullscreenModeForTab,
base::Unretained(this), source, origin);
permission_helper->RequestFullscreenPermission(callback);
}
void WebContents::OnEnterFullscreenModeForTab(content::WebContents* source,
const GURL& origin,
bool allowed) {
if (!allowed)
return;
CommonWebContentsDelegate::EnterFullscreenModeForTab(source, origin);
Emit("enter-html-full-screen");
}

5
atom/browser/api/atom_api_web_contents.h
View File

@@ -133,6 +133,11 @@ class WebContents : public mate::TrackableObject<WebContents>,
void SetAllowTransparency(bool allow);
bool IsGuest() const;
// Callback triggered on permission response.
void OnEnterFullscreenModeForTab(content::WebContents* source,
const GURL& origin,
bool allowed);
// Returns the web preferences of current WebContents.
v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);

6
atom/browser/web_contents_permission_helper.cc
View File

@@ -102,6 +102,12 @@ void WebContentsPermissionHelper::RequestPermission(
base::Bind(&OnPermissionResponse, callback));
}
void WebContentsPermissionHelper::RequestFullscreenPermission(
const base::Callback<void(bool)>& callback) {
RequestPermission((content::PermissionType)(PermissionType::FULLSCREEN),
callback);
}
void WebContentsPermissionHelper::RequestMediaAccessPermission(
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& response_callback) {

2
atom/browser/web_contents_permission_helper.h
View File

@@ -22,6 +22,8 @@ class WebContentsPermissionHelper
FULLSCREEN
};
void RequestFullscreenPermission(
const base::Callback<void(bool)>& callback);
void RequestMediaAccessPermission(
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback);