summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-08 21:27:28 +0000
committerraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-08 21:27:28 +0000
commit8ae73b8a54edaec49c0f158e58e55098fe72e31a (patch)
tree0483f6f03f5f48730967e311363c0b8a89a769d1 /chrome/chrome.gyp
parent8925704a862a5d26e073d08455825341f07f527c (diff)
downloadchromium_src-8ae73b8a54edaec49c0f158e58e55098fe72e31a.zip
chromium_src-8ae73b8a54edaec49c0f158e58e55098fe72e31a.tar.gz
chromium_src-8ae73b8a54edaec49c0f158e58e55098fe72e31a.tar.bz2
Revert 166758 - Move navigation interception component to content/components
Broke the build at http://build.chromium.org/p/chromium.linux/builders/Android%20Builder%20%28dbg%29/builds/20261 Original commit message follows: 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 TBR=jknotten@chromium.org Review URL: https://codereview.chromium.org/11361177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 16e4709..801221f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1050,8 +1050,8 @@
'type': 'none',
'dependencies': [
'../base/base.gyp:base',
+ '../chrome/browser/component/components.gyp:navigation_interception_java',
'../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
- '../content/content.gyp:navigation_interception_java',
'../content/content.gyp:content_java',
'../ui/ui.gyp:ui_java',
],