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

Unified Diff: content/content.gyp

Issue 786063002: Revert of Implement HasPermission() method in PermissionService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 0a7922dc3a42b80199fc09d361f7a574c3c1f6fb..cb10121903635107f4c4474e6422ea9ec42f06f5 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -21,13 +21,11 @@
}],
],
},
- 'includes': [
- 'content_common_mojo_bindings.gypi',
- ],
'conditions': [
['OS != "ios"', {
'includes': [
'../build/win_precompile.gypi',
+ 'content_common_mojo_bindings.gypi',
'content_resources.gypi',
],
}],
@@ -69,16 +67,15 @@
'dependencies': [
'content_browser',
'content_common',
- 'content_common_mojo_bindings',
],
'export_dependent_settings': [
'content_common',
- 'content_common_mojo_bindings',
],
'conditions': [
['OS != "ios"', {
'dependencies': [
'content_child',
+ 'content_common_mojo_bindings',
'content_gpu',
'content_plugin',
'content_ppapi_plugin',
@@ -142,11 +139,9 @@
],
'dependencies': [
'content_common',
- 'content_common_mojo_bindings',
],
'export_dependent_settings': [
'content_common',
- 'content_common_mojo_bindings',
],
},
{
@@ -162,11 +157,9 @@
],
'dependencies': [
'content_common',
- 'content_common_mojo_bindings',
],
'export_dependent_settings': [
'content_common',
- 'content_common_mojo_bindings',
],
'conditions': [
['java_bridge==1', {
@@ -182,6 +175,7 @@
}],
['OS != "ios"', {
'dependencies': [
+ 'content_common_mojo_bindings',
'content_resources',
],
}],
@@ -195,12 +189,10 @@
'includes': [
'content_common.gypi',
],
- 'dependencies': [
- 'content_common_mojo_bindings',
- ],
'conditions': [
['OS != "ios"', {
'dependencies': [
+ 'content_common_mojo_bindings',
'content_resources',
],
}],
@@ -312,18 +304,19 @@
'type': 'shared_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
- 'content_common_mojo_bindings',
'content_resources',
],
- 'export_dependent_settings': [
- 'content_common_mojo_bindings',
- ],
'conditions': [
['chromium_enable_vtune_jit_for_v8==1', {
'dependencies': [
'../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