summaryrefslogtreecommitdiffstats
path: root/android_webview/android_webview.gyp
diff options
context:
space:
mode:
authorjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 14:05:14 +0000
committerjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 14:05:14 +0000
commit9a34490644388470d021aa043683f2a8dd5876f4 (patch)
tree6f9d4011aa4a692191d8d761b64e383aca01190f /android_webview/android_webview.gyp
parent9d611ca0375cf3594423fa8571a30ed356e568f6 (diff)
downloadchromium_src-9a34490644388470d021aa043683f2a8dd5876f4.zip
chromium_src-9a34490644388470d021aa043683f2a8dd5876f4.tar.gz
chromium_src-9a34490644388470d021aa043683f2a8dd5876f4.tar.bz2
Move WebContentsDelegateAndroid to content/components
1. Move chrome/browser/component/web_contents_delegate_android to content/components/web_contents_delegate_android. 2. Rename package org.chromium.chrome.browser.component. web_contents_delegate_android to org.chromium.content.components. web_contents_delegate_android. 3. Remove shouldOverrideUrlLoading from WebContentsDelegateAndroid interface, which is no longer required. I will follow up with a second change to completely remove chrome/browser/component/web_contents_delegate_android once external dependencies on it have been removed. BUG=157575 Review URL: https://chromiumcodereview.appspot.com/11365199 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/android_webview.gyp')
-rw-r--r--android_webview/android_webview.gyp9
1 files changed, 4 insertions, 5 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 10113c9..1582ebb 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -28,11 +28,10 @@
'target_name': 'android_webview_common',
'type': 'static_library',
'dependencies': [
+ '../android_webview/native/webview_native.gyp:webview_native',
'../content/content.gyp:content',
'../content/content.gyp:navigation_interception',
- '../android_webview/native/webview_native.gyp:webview_native',
- '../chrome/browser/component/components.gyp:web_contents_delegate_android',
- '../chrome/browser/component/components.gyp:browser_component_jni_headers',
+ '../content/content.gyp:web_contents_delegate_android',
'../ui/ui.gyp:ui_resources',
],
'include_dirs': [
@@ -106,7 +105,7 @@
'dependencies': [
'../content/content.gyp:content_java',
'../content/content.gyp:navigation_interception_java',
- '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+ '../content/content.gyp:web_contents_delegate_android_java',
'../ui/ui.gyp:ui_java',
],
'variables': {
@@ -120,11 +119,11 @@
'type': 'none',
'dependencies': [
'../base/base.gyp:base_java',
- '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
'../chrome/chrome_resources.gyp:packed_extra_resources',
'../chrome/chrome_resources.gyp:packed_resources',
'../content/content.gyp:content_java',
'../content/content.gyp:navigation_interception_java',
+ '../content/content.gyp:web_contents_delegate_android_java',
'../media/media.gyp:media_java',
'../net/net.gyp:net_java',
'../ui/ui.gyp:ui_java',