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

Issue 11293017: Move navigation interception component to content/components (Closed)

Created:
8 years, 1 month ago by John Knottenbelt
Modified:
8 years, 1 month ago
CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org, android-webview-reviews_chromium.org
Visibility:
Public.

Description

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 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=166883

Patch Set 1 #

Total comments: 18

Patch Set 2 : Address nits #

Patch Set 3 : Output to navigation_interception/ and use +jni in DEPS #

Total comments: 1

Patch Set 4 : Move unit test into content_unittests. #

Total comments: 4

Patch Set 5 : Address feedback. Move Java class to org.chromium.content.components.navigation_interception #

Patch Set 6 : Resolve circular dependency between content.gyp and content_components.gyp #

Patch Set 7 : Fix JNI generation path problem. #

Patch Set 8 : #

Total comments: 3

Patch Set 9 : Move gypi to content/ #

Patch Set 10 : Fix windows link error, undef CONTENT_IMPLEMENTATION #

Patch Set 11 : Make this a two-sided patch. #

Patch Set 12 : Adjust Android.mk for Android Webview target. #

Patch Set 13 : Rebase. #

Patch Set 14 : Upload again (previous was incomplete) #

Patch Set 15 : Wrap the long line in Android.mk to satisfy presubmit for CQ. #

Patch Set 16 : Add findbugs suppression for compatibility code. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+171 lines, -835 lines) Patch
M android_webview/Android.mk View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +2 lines, -1 line 0 comments Download
M android_webview/DEPS View 1 1 chunk +3 lines, -3 lines 0 comments Download
M android_webview/android_webview.gyp View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 3 chunks +3 lines, -3 lines 0 comments Download
M android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M android_webview/java/src/org/chromium/android_webview/AwContents.java View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +1 line, -1 line 0 comments Download
M android_webview/native/android_webview_jni_registrar.cc View 1 2 3 4 1 chunk +2 lines, -2 lines 0 comments Download
M android_webview/native/aw_contents.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 2 chunks +2 lines, -2 lines 0 comments Download
M build/android/findbugs_filter/findbugs_known_bugs.txt View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/DEPS View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/android/chrome_jni_registrar.cc View 1 2 3 4 5 6 7 8 9 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/component/components.gyp View 1 2 3 4 5 6 7 8 9 10 1 chunk +5 lines, -1 line 0 comments Download
D chrome/browser/component/navigation_interception/component_jni_registrar.h View 1 chunk +0 lines, -18 lines 0 comments Download
D chrome/browser/component/navigation_interception/component_jni_registrar.cc View 1 chunk +0 lines, -22 lines 0 comments Download
M chrome/browser/component/navigation_interception/intercept_navigation_delegate.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +5 lines, -51 lines 0 comments Download
D chrome/browser/component/navigation_interception/intercept_navigation_delegate.cc View 1 chunk +0 lines, -109 lines 0 comments Download
D chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle.h View 1 chunk +0 lines, -59 lines 0 comments Download
D chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle.cc View 1 chunk +0 lines, -122 lines 0 comments Download
D chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle_unittest.cc View 1 chunk +0 lines, -348 lines 0 comments Download
M chrome/browser/component/navigation_interception/java/src/org/chromium/chrome/browser/component/navigation_interception/InterceptNavigationDelegate.java View 1 2 3 4 5 6 7 8 9 10 1 chunk +5 lines, -14 lines 0 comments Download
M chrome/browser/component/navigation_interception/navigation_interception.gypi View 1 2 3 4 5 6 7 8 9 10 2 chunks +5 lines, -41 lines 0 comments Download
M chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc View 1 2 3 4 5 6 7 8 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/chrome.gyp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M chrome/chrome_browser.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +1 line, -1 line 0 comments Download
M chrome/chrome_tests.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +0 lines, -1 line 0 comments Download
M content/OWNERS View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +3 lines, -0 lines 0 comments Download
A + content/components/navigation_interception/DEPS View 1 2 3 4 5 6 7 8 9 10 1 chunk +3 lines, -2 lines 0 comments Download
A + content/components/navigation_interception/OWNERS View 1 2 3 4 5 6 7 8 9 10 0 chunks +-1 lines, --1 lines 0 comments Download
A content/components/navigation_interception/component_jni_registrar.h View 1 1 chunk +18 lines, -0 lines 0 comments Download
A + content/components/navigation_interception/component_jni_registrar.cc View 1 1 chunk +5 lines, -5 lines 0 comments Download
A + content/components/navigation_interception/intercept_navigation_delegate.h View 1 2 3 4 5 6 7 8 9 10 3 chunks +5 lines, -5 lines 0 comments Download
A + content/components/navigation_interception/intercept_navigation_delegate.cc View 1 2 3 chunks +4 lines, -4 lines 0 comments Download
A + content/components/navigation_interception/intercept_navigation_resource_throttle.h View 1 3 chunks +5 lines, -5 lines 0 comments Download
A + content/components/navigation_interception/intercept_navigation_resource_throttle.cc View 1 3 chunks +3 lines, -3 lines 0 comments Download
A + content/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc View 1 2 3 4 chunks +4 lines, -5 lines 0 comments Download
A + content/components/navigation_interception/java/src/org/chromium/content/components/navigation_interception/InterceptNavigationDelegate.java View 1 2 3 4 5 6 7 8 9 10 1 chunk +1 line, -1 line 0 comments Download
M content/content.gyp View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
A content/content_components_navigation_interception.gypi View 1 2 3 4 5 6 7 8 9 10 1 chunk +75 lines, -0 lines 0 comments Download
M content/content_tests.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 2 chunks +2 lines, -0 lines 0 comments Download

Messages

Total messages: 47 (0 generated)
John Knottenbelt
First cut at moving the navigation_interception component into it's new home. If you feel anybody ...
8 years, 1 month ago (2012-10-31 18:02:31 UTC) #1
Jói
Mostly LGTM, some nits below. I think we can defer the unit test build change, ...
8 years, 1 month ago (2012-10-31 21:18:26 UTC) #2
mkosiba (inactive)
https://codereview.chromium.org/11293017/diff/1/content/components/navigation_interception/DEPS File content/components/navigation_interception/DEPS (right): https://codereview.chromium.org/11293017/diff/1/content/components/navigation_interception/DEPS#newcode4 content/components/navigation_interception/DEPS:4: "+navigation_interception/jni/InterceptNavigationDelegate_jni.h", I always thought it is a BAD IDEA(tm) ...
8 years, 1 month ago (2012-10-31 22:41:26 UTC) #3
John Knottenbelt
http://codereview.chromium.org/11293017/diff/1/android_webview/DEPS File android_webview/DEPS (right): http://codereview.chromium.org/11293017/diff/1/android_webview/DEPS#newcode11 android_webview/DEPS:11: "+chrome/browser/component", On 2012/10/31 21:18:27, Jói wrote: > You could ...
8 years, 1 month ago (2012-11-02 14:48:25 UTC) #4
joth
http://codereview.chromium.org/11293017/diff/1/content/components/navigation_interception/DEPS File content/components/navigation_interception/DEPS (right): http://codereview.chromium.org/11293017/diff/1/content/components/navigation_interception/DEPS#newcode4 content/components/navigation_interception/DEPS:4: "+navigation_interception/jni/InterceptNavigationDelegate_jni.h", On 2012/11/02 14:48:25, John Knottenbelt wrote: > On ...
8 years, 1 month ago (2012-11-02 15:18:53 UTC) #5
mkosiba (inactive)
http://codereview.chromium.org/11293017/diff/1/content/components/navigation_interception/DEPS File content/components/navigation_interception/DEPS (right): http://codereview.chromium.org/11293017/diff/1/content/components/navigation_interception/DEPS#newcode4 content/components/navigation_interception/DEPS:4: "+navigation_interception/jni/InterceptNavigationDelegate_jni.h", On 2012/11/02 14:48:25, John Knottenbelt wrote: > On ...
8 years, 1 month ago (2012-11-02 15:36:27 UTC) #6
John Knottenbelt
Thanks for the help with the DEPS and jni generator! Here it is again. http://codereview.chromium.org/11293017/diff/1/content/components/navigation_interception/navigation_interception.gypi ...
8 years, 1 month ago (2012-11-02 16:34:44 UTC) #7
mkosiba (inactive)
lgtm
8 years, 1 month ago (2012-11-02 16:50:25 UTC) #8
jam
https://codereview.chromium.org/11293017/diff/11001/content/components/navigation_interception/DEPS File content/components/navigation_interception/DEPS (right): https://codereview.chromium.org/11293017/diff/11001/content/components/navigation_interception/DEPS#newcode4 content/components/navigation_interception/DEPS:4: "+chrome/test/base/chrome_render_view_host_test_harness.h", anything below content/ shouldn't depend on chrome/. how ...
8 years, 1 month ago (2012-11-02 16:52:37 UTC) #9
jam
https://codereview.chromium.org/11293017/diff/1/chrome/chrome_tests.gypi File chrome/chrome_tests.gypi (right): https://codereview.chromium.org/11293017/diff/1/chrome/chrome_tests.gypi#newcode1249 chrome/chrome_tests.gypi:1249: '../content/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc', On 2012/10/31 21:18:27, Jói wrote: > Add a ...
8 years, 1 month ago (2012-11-02 16:57:56 UTC) #10
mkosiba (inactive)
On 2012/11/02 16:57:56, John Abd-El-Malek wrote: > https://codereview.chromium.org/11293017/diff/1/chrome/chrome_tests.gypi > File chrome/chrome_tests.gypi (right): > > https://codereview.chromium.org/11293017/diff/1/chrome/chrome_tests.gypi#newcode1249 ...
8 years, 1 month ago (2012-11-02 17:20:39 UTC) #11
jam
On 2012/11/02 17:20:39, Martin Kosiba wrote: > On 2012/11/02 16:57:56, John Abd-El-Malek wrote: > > ...
8 years, 1 month ago (2012-11-02 17:23:15 UTC) #12
John Knottenbelt
Adding owners. Please could you review: Yaron - chrome/browser/android Darin - chrome/browser/renderer_hosts, gyp changes in ...
8 years, 1 month ago (2012-11-02 19:02:47 UTC) #13
Jói
>> The tests run fine using the test_renderer_host (checked that some time >> ago). >> ...
8 years, 1 month ago (2012-11-02 19:29:35 UTC) #14
jam
thanks, lgtm with one nit https://codereview.chromium.org/11293017/diff/8006/content/components/navigation_interception/DEPS File content/components/navigation_interception/DEPS (right): https://codereview.chromium.org/11293017/diff/8006/content/components/navigation_interception/DEPS#newcode13 content/components/navigation_interception/DEPS:13: "!chrome/test/base", now this and ...
8 years, 1 month ago (2012-11-02 20:37:54 UTC) #15
jam
On 2012/11/02 19:02:47, John Knottenbelt wrote: > Adding owners. Please could you review: > > ...
8 years, 1 month ago (2012-11-02 20:46:22 UTC) #16
jam
https://codereview.chromium.org/11293017/diff/8006/chrome/chrome.gyp File chrome/chrome.gyp (right): https://codereview.chromium.org/11293017/diff/8006/chrome/chrome.gyp#newcode1053 chrome/chrome.gyp:1053: '../content/components/content_components.gyp:navigation_interception_java', nit: order
8 years, 1 month ago (2012-11-02 20:46:41 UTC) #17
Yaron
lgtm
8 years, 1 month ago (2012-11-03 00:54:56 UTC) #18
John Knottenbelt
https://codereview.chromium.org/11293017/diff/8006/chrome/chrome.gyp File chrome/chrome.gyp (right): https://codereview.chromium.org/11293017/diff/8006/chrome/chrome.gyp#newcode1053 chrome/chrome.gyp:1053: '../content/components/content_components.gyp:navigation_interception_java', On 2012/11/02 20:46:42, John Abd-El-Malek wrote: > nit: ...
8 years, 1 month ago (2012-11-05 11:55:06 UTC) #19
mkosiba (inactive)
java class move LGTM
8 years, 1 month ago (2012-11-05 11:56:52 UTC) #20
joth
lgtm
8 years, 1 month ago (2012-11-05 14:16:27 UTC) #21
John Knottenbelt
John, Joi, please take a look. This solves the circular dependency between content.gyp and content_components.gyp ...
8 years, 1 month ago (2012-11-05 15:45:48 UTC) #22
Jói
https://codereview.chromium.org/11293017/diff/3009/content/components/navigation_interception/navigation_interception.gypi File content/components/navigation_interception/navigation_interception.gypi (right): https://codereview.chromium.org/11293017/diff/3009/content/components/navigation_interception/navigation_interception.gypi#newcode9 content/components/navigation_interception/navigation_interception.gypi:9: 'target_name': 'navigation_interception', There was a recent discussion on chromium-dev@ ...
8 years, 1 month ago (2012-11-05 16:02:01 UTC) #23
John Knottenbelt
https://codereview.chromium.org/11293017/diff/3009/content/components/navigation_interception/navigation_interception.gypi File content/components/navigation_interception/navigation_interception.gypi (right): https://codereview.chromium.org/11293017/diff/3009/content/components/navigation_interception/navigation_interception.gypi#newcode9 content/components/navigation_interception/navigation_interception.gypi:9: 'target_name': 'navigation_interception', I've been struggling with the pathname relativization ...
8 years, 1 month ago (2012-11-05 16:15:14 UTC) #24
jam
https://codereview.chromium.org/11293017/diff/3009/content/components/navigation_interception/navigation_interception.gypi File content/components/navigation_interception/navigation_interception.gypi (right): https://codereview.chromium.org/11293017/diff/3009/content/components/navigation_interception/navigation_interception.gypi#newcode9 content/components/navigation_interception/navigation_interception.gypi:9: 'target_name': 'navigation_interception', On 2012/11/05 16:02:01, Jói wrote: > There ...
8 years, 1 month ago (2012-11-05 20:33:13 UTC) #25
Jói
> Please advise how I should rename this file, I'm thinking something like > content_components_navigation_interception.gypi ...
8 years, 1 month ago (2012-11-05 21:07:39 UTC) #26
John Knottenbelt
This moves the gypi to content/ so that it is side by side with content.gyp. ...
8 years, 1 month ago (2012-11-06 17:07:06 UTC) #27
Jói
LGTM
8 years, 1 month ago (2012-11-06 21:53:07 UTC) #28
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jknotten@chromium.org/11293017/1083
8 years, 1 month ago (2012-11-07 10:23:17 UTC) #29
commit-bot: I haz the power
Sorry for I got bad news for ya. Compile failed with a clobber build on ...
8 years, 1 month ago (2012-11-07 11:28:17 UTC) #30
John Knottenbelt
I've added a few bits in chrome/browser/components so that the downstream tree can continue to ...
8 years, 1 month ago (2012-11-07 15:27:50 UTC) #31
Jói
LGTM
8 years, 1 month ago (2012-11-07 16:21:11 UTC) #32
Torne
Android.mk change LGTM
8 years, 1 month ago (2012-11-07 16:47:04 UTC) #33
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jknotten@chromium.org/11293017/10098
8 years, 1 month ago (2012-11-07 17:35:43 UTC) #34
commit-bot: I haz the power
Failed to apply patch for content/OWNERS: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...
8 years, 1 month ago (2012-11-07 17:35:55 UTC) #35
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jknotten@chromium.org/11293017/12093
8 years, 1 month ago (2012-11-08 10:39:17 UTC) #36
commit-bot: I haz the power
Presubmit check for 11293017-12093 failed and returned exit status 1. Running presubmit commit checks ...
8 years, 1 month ago (2012-11-08 10:39:38 UTC) #37
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jknotten@chromium.org/11293017/5094
8 years, 1 month ago (2012-11-08 14:31:09 UTC) #38
commit-bot: I haz the power
Presubmit check for 11293017-5094 failed and returned exit status 1. Running presubmit commit checks ...
8 years, 1 month ago (2012-11-08 14:31:27 UTC) #39
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jknotten@chromium.org/11293017/5094
8 years, 1 month ago (2012-11-08 14:49:04 UTC) #40
commit-bot: I haz the power
Presubmit check for 11293017-5094 failed and returned exit status 1. Running presubmit commit checks ...
8 years, 1 month ago (2012-11-08 14:49:31 UTC) #41
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jknotten@chromium.org/11293017/12095
8 years, 1 month ago (2012-11-08 15:26:40 UTC) #42
commit-bot: I haz the power
Retried try job too often for step(s) browser_tests
8 years, 1 month ago (2012-11-08 18:11:51 UTC) #43
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jknotten@chromium.org/11293017/12095
8 years, 1 month ago (2012-11-08 20:28:47 UTC) #44
commit-bot: I haz the power
Change committed as 166758
8 years, 1 month ago (2012-11-08 21:05:21 UTC) #45
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jknotten@chromium.org/11293017/6068
8 years, 1 month ago (2012-11-09 08:17:00 UTC) #46
commit-bot: I haz the power
8 years, 1 month ago (2012-11-09 10:06:18 UTC) #47
Change committed as 166883

Powered by Google App Engine
This is Rietveld 408576698