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

window: supports HTML5 fullscreen api

Browse source
This commit is contained in:
deepak1556 2015-04-21 19:05:36 +05:30
parent 67bc4afe88
commit 20b4cae980
6 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/native_window.cc
View file

@ -685,6 +685,20 @@ void NativeWindow::RendererResponsive(content::WebContents* source) {
FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnRendererResponsive()); FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnRendererResponsive());
} }
void NativeWindow::EnterFullscreenModeForTab(content::WebContents* source,
const GURL& origin) {
SetFullScreen(true);
}
void NativeWindow::ExitFullscreenModeForTab(content::WebContents* source) {
SetFullScreen(false);
}
bool NativeWindow::IsFullscreenForTabOrPending(
const content::WebContents* source) const {
return IsFullscreen();
}
void NativeWindow::BeforeUnloadFired(const base::TimeTicks& proceed_time) { void NativeWindow::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
// Do nothing, we override this method just to avoid compilation error since // Do nothing, we override this method just to avoid compilation error since
// there are two virtual functions named BeforeUnloadFired. // there are two virtual functions named BeforeUnloadFired.

7
atom/browser/native_window.h
View file

@ -112,7 +112,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
virtual void Restore() = 0; virtual void Restore() = 0;
virtual bool IsMinimized() = 0; virtual bool IsMinimized() = 0;
virtual void SetFullScreen(bool fullscreen) = 0; virtual void SetFullScreen(bool fullscreen) = 0;
virtual bool IsFullscreen() = 0; virtual bool IsFullscreen() const = 0;
virtual void SetSize(const gfx::Size& size) = 0; virtual void SetSize(const gfx::Size& size) = 0;
virtual gfx::Size GetSize() = 0; virtual gfx::Size GetSize() = 0;
virtual void SetContentSize(const gfx::Size& size) = 0; virtual void SetContentSize(const gfx::Size& size) = 0;
@ -273,6 +273,11 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
const content::WebContents* source) const override; const content::WebContents* source) const override;
void RendererUnresponsive(content::WebContents* source) override; void RendererUnresponsive(content::WebContents* source) override;
void RendererResponsive(content::WebContents* source) override; void RendererResponsive(content::WebContents* source) override;
void EnterFullscreenModeForTab(content::WebContents* source,
const GURL& origin) override;
void ExitFullscreenModeForTab(content::WebContents* source) override;
bool IsFullscreenForTabOrPending(
const content::WebContents* source) const override;
// Implementations of content::WebContentsObserver. // Implementations of content::WebContentsObserver.
void RenderViewCreated(content::RenderViewHost* render_view_host) override; void RenderViewCreated(content::RenderViewHost* render_view_host) override;

2
atom/browser/native_window_mac.h
View file

@ -44,7 +44,7 @@ class NativeWindowMac : public NativeWindow {
void Restore() override; void Restore() override;
bool IsMinimized() override; bool IsMinimized() override;
void SetFullScreen(bool fullscreen) override; void SetFullScreen(bool fullscreen) override;
bool IsFullscreen() override; bool IsFullscreen() const override;
void SetSize(const gfx::Size& size) override; void SetSize(const gfx::Size& size) override;
gfx::Size GetSize() override; gfx::Size GetSize() override;
void SetContentSize(const gfx::Size& size) override; void SetContentSize(const gfx::Size& size) override;

2
atom/browser/native_window_mac.mm
View file

@ -476,7 +476,7 @@ void NativeWindowMac::SetFullScreen(bool fullscreen) {
[window_ toggleFullScreen:nil]; [window_ toggleFullScreen:nil];
} }
bool NativeWindowMac::IsFullscreen() { bool NativeWindowMac::IsFullscreen() const {
return [window_ styleMask] & NSFullScreenWindowMask; return [window_ styleMask] & NSFullScreenWindowMask;
} }

2
atom/browser/native_window_views.cc
View file

@ -369,7 +369,7 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) {
#endif #endif
} }
bool NativeWindowViews::IsFullscreen() { bool NativeWindowViews::IsFullscreen() const {
return window_->IsFullscreen(); return window_->IsFullscreen();
} }

2
atom/browser/native_window_views.h
View file

@ -49,7 +49,7 @@ class NativeWindowViews : public NativeWindow,
void Restore() override; void Restore() override;
bool IsMinimized() override; bool IsMinimized() override;
void SetFullScreen(bool fullscreen) override; void SetFullScreen(bool fullscreen) override;
bool IsFullscreen() override; bool IsFullscreen() const override;
void SetSize(const gfx::Size& size) override; void SetSize(const gfx::Size& size) override;
gfx::Size GetSize() override; gfx::Size GetSize() override;
void SetContentSize(const gfx::Size& size) override; void SetContentSize(const gfx::Size& size) override;