Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(967)

Unified Diff: content/content.gyp

Issue 750633003: Implement HasPermission() method in PermissionService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove comment in content_tests.gypi Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/permission_service.mojom ('k') | content/content_app.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index cbb21cdc6b43a10298822a68ffb0f99c998ef2e1..19468b651a54ec6f934f8a8a087d56517dd5aa22 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -21,11 +21,13 @@
}],
],
},
+ 'includes': [
+ 'content_common_mojo_bindings.gypi',
+ ],
'conditions': [
['OS != "ios"', {
'includes': [
'../build/win_precompile.gypi',
- 'content_common_mojo_bindings.gypi',
'content_resources.gypi',
],
}],
@@ -75,7 +77,6 @@
['OS != "ios"', {
'dependencies': [
'content_child',
- 'content_common_mojo_bindings',
'content_gpu',
'content_plugin',
'content_ppapi_plugin',
@@ -175,7 +176,6 @@
}],
['OS != "ios"', {
'dependencies': [
- 'content_common_mojo_bindings',
'content_resources',
],
}],
@@ -189,10 +189,15 @@
'includes': [
'content_common.gypi',
],
+ 'dependencies': [
+ 'content_common_mojo_bindings',
+ ],
+ 'export_dependent_settings': [
+ 'content_common_mojo_bindings',
blundell 2014/12/04 12:21:44 This isn't technically correct, since no code unde
timvolodine 2014/12/04 12:58:01 my rationale was that: permission_service.mojom an
+ ],
'conditions': [
['OS != "ios"', {
'dependencies': [
- 'content_common_mojo_bindings',
'content_resources',
],
}],
@@ -304,6 +309,7 @@
'type': 'shared_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
+ 'content_common_mojo_bindings',
'content_resources',
],
'conditions': [
@@ -312,11 +318,6 @@
'../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
],
}],
- ['OS != "ios"', {
- 'dependencies': [
- 'content_common_mojo_bindings',
- ]
- }]
],
'includes': [
'content_app.gypi',
« no previous file with comments | « content/common/permission_service.mojom ('k') | content/content_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698