diff options
author | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 21:05:19 +0000 |
---|---|---|
committer | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 21:05:19 +0000 |
commit | 6870f228064af73a7a341541782c8e6337183a48 (patch) | |
tree | 6b538446373193ba449980eb4e6c9e27a9ef58a8 /content/content_components_navigation_interception.gypi | |
parent | dc46d8f470aae1bddf179f16823b20f4cb240927 (diff) | |
download | chromium_src-6870f228064af73a7a341541782c8e6337183a48.zip chromium_src-6870f228064af73a7a341541782c8e6337183a48.tar.gz chromium_src-6870f228064af73a7a341541782c8e6337183a48.tar.bz2 |
Move navigation interception component to content/components
1. Move C++ source from chrome/browser/component/navigation_interception
to content/components/navigation_interception.
2. Change the namespace from navigation_interception:: to content::
3. Change Java package from org.chromium.chrome.browser.components.
navigation_interception to org.chromium.content.components.
navigation_interception.
I will follow up with another patch to completely remove
chrome/browser/component/navigation_interception once external
dependencies have been updated to use the component at its new
component
BUG=157575
Review URL: https://chromiumcodereview.appspot.com/11293017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_components_navigation_interception.gypi')
-rw-r--r-- | content/content_components_navigation_interception.gypi | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/content/content_components_navigation_interception.gypi b/content/content_components_navigation_interception.gypi new file mode 100644 index 0000000..54a1602 --- /dev/null +++ b/content/content_components_navigation_interception.gypi @@ -0,0 +1,75 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# +# 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', + 'defines!': ['CONTENT_IMPLEMENTATION'], + 'dependencies': [ + '../base/base.gyp:base', + '../net/net.gyp:net', + 'content_browser', + 'content_common', + ], + 'include_dirs': [ + '..', + '../skia/config', + '<(SHARED_INTERMEDIATE_DIR)/navigation_interception', + + ], + 'sources': [ + 'components/navigation_interception/intercept_navigation_resource_throttle.cc', + 'components/navigation_interception/intercept_navigation_resource_throttle.h', + ], + 'conditions': [ + ['OS=="android"', { + 'dependencies': [ + 'navigation_interception_jni_headers', + ], + 'sources': [ + 'components/navigation_interception/component_jni_registrar.cc', + 'components/navigation_interception/component_jni_registrar.h', + 'components/navigation_interception/intercept_navigation_delegate.cc', + 'components/navigation_interception/intercept_navigation_delegate.h', + ], + }], + ], + }, + ], + 'conditions': [ + ['OS=="android"', { + 'targets': [ + { + 'target_name': 'navigation_interception_java', + 'type': 'none', + 'dependencies': [ + '../base/base.gyp:base', + ], + 'variables': { + 'package_name': 'navigation_interception', + 'java_in_dir': 'components/navigation_interception/java', + # TODO(jknotten): Remove once external dependencies have been + # updated to use the interface in its new package. + 'additional_src_dirs' : ['../chrome/browser/component/navigation_interception/java'] + }, + 'includes': [ '../build/java.gypi' ], + }, + { + 'target_name': 'navigation_interception_jni_headers', + 'type': 'none', + 'sources': [ + 'components/navigation_interception/java/src/org/chromium/content/components/navigation_interception/InterceptNavigationDelegate.java', + ], + 'variables': { + 'jni_gen_dir': 'navigation_interception', + }, + 'includes': [ '../build/jni_generator.gypi' ], + }, + ], + }], + ], +} |