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

track html api triggered fullscreen separaely

Browse source
This commit is contained in:
deepak1556 2015-05-17 01:37:46 +05:30
parent 4fe294ed04
commit ddda8e4197
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/native_window.cc
View file

@ -99,6 +99,7 @@ NativeWindow::NativeWindow(content::WebContents* web_contents,
is_closed_(false),
node_integration_(true),
has_dialog_attached_(false),
fullscreen_(false),
zoom_factor_(1.0),
weak_factory_(this),
inspectable_web_contents_(
@ -698,16 +699,16 @@ void NativeWindow::RendererResponsive(content::WebContents* source) {
void NativeWindow::EnterFullscreenModeForTab(content::WebContents* source,
const GURL& origin) {
SetFullScreen(true);
SetHtmlApiFullscreen(true);
}
void NativeWindow::ExitFullscreenModeForTab(content::WebContents* source) {
SetFullScreen(false);
SetHtmlApiFullscreen(false);
}
bool NativeWindow::IsFullscreenForTabOrPending(
const content::WebContents* source) const {
return IsFullscreen();
return IsHtmlApiFullscreen();
}
void NativeWindow::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
@ -800,6 +801,11 @@ void NativeWindow::ScheduleUnresponsiveEvent(int ms) {
base::TimeDelta::FromMilliseconds(ms));
}
void NativeWindow::SetHtmlApiFullscreen(bool enter_fullscreen) {
SetFullScreen(enter_fullscreen);
fullscreen_ = enter_fullscreen;
}
void NativeWindow::NotifyWindowUnresponsive() {
window_unresposive_closure_.Cancel();