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

Side by Side Diff: chrome/browser/component/components.gyp

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'includes': [ 7 'includes': [
8 'navigation_interception/navigation_interception.gypi', 8 'navigation_interception/navigation_interception.gypi',
9 'web_contents_delegate_android/web_contents_delegate_android.gypi', 9 'web_contents_delegate_android/web_contents_delegate_android.gypi',
10 ], 10 ],
11 11
12 'conditions': [ 12 'conditions': [
13 ['OS=="android"', { 13 ['OS=="android"', {
14 'targets': [ 14 'targets': [
15 { 15 {
16 'target_name': 'browser_component_jni_headers', 16 'target_name': 'browser_component_jni_headers',
17 'type': 'none', 17 'type': 'none',
18 'dependencies': [
19 # TODO(jknotten) Remove this dependency once external deps have
20 # been updated to refer directly to the below.
21 '../../../content/content.gyp:navigation_interception_jni_headers'
22 ],
18 'sources': [ 23 'sources': [
19 'web_contents_delegate_android/java/src/org/chromium/chrome/browser/ component/web_contents_delegate_android/WebContentsDelegateAndroid.java', 24 'web_contents_delegate_android/java/src/org/chromium/chrome/browser/ component/web_contents_delegate_android/WebContentsDelegateAndroid.java',
20 'navigation_interception/java/src/org/chromium/chrome/browser/compon ent/navigation_interception/InterceptNavigationDelegate.java',
21 ], 25 ],
22 'variables': { 26 'variables': {
23 'jni_gen_dir': 'chrome/browser_component', 27 'jni_gen_dir': 'chrome/browser_component',
24 }, 28 },
25 'includes': [ '../../../build/jni_generator.gypi' ], 29 'includes': [ '../../../build/jni_generator.gypi' ],
26 }, 30 },
27 ], 31 ],
28 }], 32 }],
29 ], 33 ],
30 } 34 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698