diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 10:09:53 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 10:09:53 +0000 |
| commit | 369d5a5c8d16cfaae4e488e5c7ba5eaefd2c12e7 (patch) | |
| tree | 2881ab290bde9f60a8ea48c2599e6c745e538d98 /apps | |
| parent | e7546bcc54d39a69eb88db377ffa8af528ff6f9e (diff) | |
| download | chromium_src-369d5a5c8d16cfaae4e488e5c7ba5eaefd2c12e7.zip chromium_src-369d5a5c8d16cfaae4e488e5c7ba5eaefd2c12e7.tar.gz chromium_src-369d5a5c8d16cfaae4e488e5c7ba5eaefd2c12e7.tar.bz2 | |
Enforce disable fullscreen policy for platform apps
CL 22986010 added a policy to disable fullscreen. This CL extends the
enforcement of this policy to platform apps as well.
BUG=275405
TEST=New browser test
Review URL: https://chromiumcodereview.appspot.com/23536059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/shell_window.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/shell_window.cc b/apps/shell_window.cc index c1d9c61..44a3858 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -386,6 +386,11 @@ void ShellWindow::UpdateAppIcon(const gfx::Image& image) { } void ShellWindow::Fullscreen() { +#if !defined(OS_MACOSX) + // Do not enter fullscreen mode if disallowed by pref. + if (!profile()->GetPrefs()->GetBoolean(prefs::kAppFullscreenAllowed)) + return; +#endif fullscreen_for_window_api_ = true; GetBaseWindow()->SetFullscreen(true); } |