android_webview/android_webview.gyp - Issue 11365199: Move WebContentsDelegateAndroid to content/components

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/android_webview.gyp

Issue 11365199: Move WebContentsDelegateAndroid to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. 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

« no previous file with comments | « android_webview/Android.mk ('k') | android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/android_webview.gyp

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp

index 10113c94e1e2bc5ce792b6bf044f0081d2fb182f..1582ebb79ee12becc10e149e8fff9f4b71c3da39 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',

« no previous file with comments | « android_webview/Android.mk ('k') | android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java » ('j') | no next file with comments »