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

Unified Diff: chrome/browser/component/navigation_interception/navigation_interception.gypi

Issue 11293017: Move navigation interception component to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add findbugs suppression for compatibility code. Created 8 years, 1 month 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
Index: chrome/browser/component/navigation_interception/navigation_interception.gypi
diff --git a/chrome/browser/component/navigation_interception/navigation_interception.gypi b/chrome/browser/component/navigation_interception/navigation_interception.gypi
index af9de6ea9bd8bae81b2452b1c456a2abaf2ea882..fe2275427b4c9adaee68d3a7e9236c566729b412 100644
--- a/chrome/browser/component/navigation_interception/navigation_interception.gypi
+++ b/chrome/browser/component/navigation_interception/navigation_interception.gypi
@@ -3,42 +3,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-{
- 'targets': [
- {
- 'target_name': 'navigation_interception',
- 'type': 'static_library',
- 'dependencies': [
- '../../../base/base.gyp:base',
- '../../../content/content.gyp:content_browser',
- '../../../content/content.gyp:content_common',
- '../../../net/net.gyp:net',
- ],
- 'include_dirs': [
- '../../../..',
- '../../../../skia/config',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_component',
+# TODO(jknotten): Remove this file once external dependencies have changed to
+# use the new location of this component at
+# content/components/navigation_interception.
- ],
- 'sources': [
- 'intercept_navigation_resource_throttle.cc',
- 'intercept_navigation_resource_throttle.h',
- ],
- 'conditions': [
- ['OS=="android"', {
- 'dependencies': [
- 'browser_component_jni_headers',
- ],
- 'sources': [
- 'component_jni_registrar.cc',
- 'component_jni_registrar.h',
- 'intercept_navigation_delegate.cc',
- 'intercept_navigation_delegate.h',
- ],
- }],
- ],
- },
- ],
+{
'conditions': [
['OS=="android"', {
'targets': [
@@ -46,13 +15,8 @@
'target_name': 'navigation_interception_java',
'type': 'none',
'dependencies': [
- '../../../base/base.gyp:base',
+ '../../../content/content.gyp:navigation_interception_java',
],
- 'variables': {
- 'package_name': 'navigation_interception',
- 'java_in_dir': 'java',
- },
- 'includes': [ '../../../../build/java.gypi' ],
},
],
}],

Powered by Google App Engine
This is Rietveld 408576698