diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:03:10 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:03:10 +0000 |
| commit | 936e85963a6d11c79c7ea774bc41c8729c04693f (patch) | |
| tree | 977c0c15dac21cc826df835f5a69ba2a2baf8215 /chrome/browser/extensions | |
| parent | bc6431ccc1c076a404a6aa6747ed8183f4e0943e (diff) | |
| download | chromium_src-936e85963a6d11c79c7ea774bc41c8729c04693f.zip chromium_src-936e85963a6d11c79c7ea774bc41c8729c04693f.tar.gz chromium_src-936e85963a6d11c79c7ea774bc41c8729c04693f.tar.bz2 | |
Add app.window.shape permission to control access to setShape.
This adds an 'app.window.shape' permission that needs to be added to the platform app's manifest to enable the setShape API.
This CL also moves fullscreen, overrideEscFullscreen and alwaysOnTopWindow permissions into the same app.window namespace as the window shape permission. Aliases from the old permission names are included for backward compat.
BUG=
R=kalman@chromium.org, meacer@chromium.org
Review URL: https://codereview.chromium.org/100423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/app_window/app_window_apitest.cc | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc index 0cf6ef0..2277942 100644 --- a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc +++ b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc @@ -49,7 +49,7 @@ const char kRequiresFramelessWindow[] = "This function requires a frameless window (frame:none)."; const char kAlwaysOnTopPermission[] = - "The \"alwaysOnTopWindows\" permission is required."; + "The \"app.window.alwaysOnTop\" permission is required."; const char kInvalidParameters[] = "Invalid parameters."; diff --git a/chrome/browser/extensions/api/app_window/app_window_apitest.cc b/chrome/browser/extensions/api/app_window/app_window_apitest.cc index 99a5c02..5866c19 100644 --- a/chrome/browser/extensions/api/app_window/app_window_apitest.cc +++ b/chrome/browser/extensions/api/app_window/app_window_apitest.cc @@ -142,6 +142,13 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, } IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, + WindowsApiAlwaysOnTopWithOldPermissions) { + EXPECT_TRUE(RunPlatformAppTest( + "platform_apps/windows_api_always_on_top/has_old_permissions")) + << message_; +} + +IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiAlwaysOnTopNoPermissions) { EXPECT_TRUE(RunPlatformAppTest( "platform_apps/windows_api_always_on_top/no_permissions")) << message_; |