diff options
| author | timvolodine <timvolodine@chromium.org> | 2014-12-09 10:18:44 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-09 18:19:08 +0000 |
| commit | 14570267ac4d5dc473d29f256e8d044e9bfcc8d2 (patch) | |
| tree | c906f1f7aa5032f5b70eb1abf83bdbdbd157e20c /content/content_app.gypi | |
| parent | 1d40eb8b81ebe2dbe6e14c487b8a3c1a10c7b4ec (diff) | |
| download | chromium_src-14570267ac4d5dc473d29f256e8d044e9bfcc8d2.zip chromium_src-14570267ac4d5dc473d29f256e8d044e9bfcc8d2.tar.gz chromium_src-14570267ac4d5dc473d29f256e8d044e9bfcc8d2.tar.bz2 | |
Implement HasPermission() method in PermissionService.
This patch implements the HasPermission() method in the mojo PermissionService.
This methiod will be required for the Permissions API, see
https://w3c.github.io/permissions/
BUG=430238
Committed: https://crrev.com/277b23d74855b51ebe67ae0da7cd9e0b053044cf
Cr-Commit-Position: refs/heads/master@{#307302}
Review URL: https://codereview.chromium.org/750633003
Cr-Commit-Position: refs/heads/master@{#307504}
Diffstat (limited to 'content/content_app.gypi')
| -rw-r--r-- | content/content_app.gypi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/content/content_app.gypi b/content/content_app.gypi index d0a3296..c68012f 100644 --- a/content/content_app.gypi +++ b/content/content_app.gypi @@ -10,6 +10,8 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../crypto/crypto.gyp:crypto', + '../mojo/edk/mojo_edk.gyp:mojo_system_impl', + '../mojo/mojo_base.gyp:mojo_environment_chromium', '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', @@ -63,11 +65,6 @@ 'app/mojo/mojo_init.cc', 'app/mojo/mojo_init.h', ], - }, { # OS!="ios" - 'dependencies': [ - '../mojo/edk/mojo_edk.gyp:mojo_system_impl', - '../mojo/mojo_base.gyp:mojo_environment_chromium', - ], }], ], } |