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

Issue 11365199: Move WebContentsDelegateAndroid to content/components (Closed)

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

Description

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

Patch Set 1 #

Total comments: 6

Patch Set 2 : Address John's comments. Adjust findbugs suppression. #

Total comments: 5

Patch Set 3 : Rebase. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+137 lines, -719 lines) Patch
M android_webview/Android.mk View 1 chunk +2 lines, -1 line 0 comments Download
M android_webview/android_webview.gyp View 3 chunks +4 lines, -5 lines 0 comments Download
M android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java View 1 chunk +1 line, -1 line 0 comments Download
M android_webview/native/android_webview_jni_registrar.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M android_webview/native/aw_web_contents_delegate.h View 2 chunks +2 lines, -2 lines 0 comments Download
M android_webview/native/webview_native.gyp View 1 chunk +1 line, -1 line 0 comments Download
M build/android/findbugs_filter/findbugs_known_bugs.txt View 1 1 chunk +1 line, -1 line 0 comments Download
M chrome/android/java/DEPS View 1 chunk +1 line, -1 line 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/android/chrome_jni_registrar.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/android/chrome_web_contents_delegate_android.h View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/component/components.gyp View 1 chunk +2 lines, -8 lines 0 comments Download
D chrome/browser/component/web_contents_delegate_android/DEPS View 1 chunk +0 lines, -4 lines 0 comments Download
M chrome/browser/component/web_contents_delegate_android/OWNERS View 1 chunk +2 lines, -0 lines 0 comments Download
D chrome/browser/component/web_contents_delegate_android/component_jni_registrar.h View 1 chunk +0 lines, -19 lines 0 comments Download
D chrome/browser/component/web_contents_delegate_android/component_jni_registrar.cc View 1 chunk +0 lines, -23 lines 0 comments Download
D chrome/browser/component/web_contents_delegate_android/java/src/org/chromium/chrome/browser/component/web_contents_delegate_android/WebContentsDelegateAndroid.java View 1 2 1 chunk +0 lines, -127 lines 0 comments Download
D chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h View 1 2 1 chunk +0 lines, -115 lines 0 comments Download
D chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.cc View 1 2 1 chunk +0 lines, -318 lines 0 comments Download
M chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi View 1 chunk +5 lines, -32 lines 0 comments Download
M chrome/chrome.gyp View 1 2 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/chrome_browser.gypi View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/chrome_browser_ui.gypi View 1 2 1 chunk +1 line, -1 line 0 comments Download
M content/OWNERS View 1 2 1 chunk +1 line, -0 lines 0 comments Download
A + content/components/web_contents_delegate_android/DEPS View 1 chunk +1 line, -0 lines 0 comments Download
A + content/components/web_contents_delegate_android/OWNERS View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/components/web_contents_delegate_android/component_jni_registrar.h View 1 chunk +3 lines, -3 lines 0 comments Download
A + content/components/web_contents_delegate_android/component_jni_registrar.cc View 1 chunk +5 lines, -5 lines 0 comments Download
A + content/components/web_contents_delegate_android/java/src/org/chromium/content/components/web_contents_delegate_android/WebContentsDelegateAndroid.java View 1 2 3 chunks +2 lines, -7 lines 0 comments Download
A + content/components/web_contents_delegate_android/web_contents_delegate_android.h View 1 2 4 chunks +22 lines, -26 lines 0 comments Download
A + content/components/web_contents_delegate_android/web_contents_delegate_android.cc View 1 2 7 chunks +9 lines, -10 lines 0 comments Download
M content/content.gyp View 1 chunk +1 line, -0 lines 0 comments Download
A content/content_components_web_contents_delegate_android.gypi View 1 chunk +62 lines, -0 lines 0 comments Download

Messages

Total messages: 12 (0 generated)
John Knottenbelt
8 years, 1 month ago (2012-11-12 17:16:00 UTC) #1
jam
lgtm https://codereview.chromium.org/11365199/diff/1/chrome/chrome.gyp File chrome/chrome.gyp (right): https://codereview.chromium.org/11365199/diff/1/chrome/chrome.gyp#newcode1054 chrome/chrome.gyp:1054: '../content/content.gyp:web_contents_delegate_android_java', nit: order https://codereview.chromium.org/11365199/diff/1/content/components/web_contents_delegate_android/web_contents_delegate_android.cc File content/components/web_contents_delegate_android/web_contents_delegate_android.cc (right): https://codereview.chromium.org/11365199/diff/1/content/components/web_contents_delegate_android/web_contents_delegate_android.cc#newcode53 ...
8 years, 1 month ago (2012-11-12 17:24:39 UTC) #2
John Knottenbelt
https://codereview.chromium.org/11365199/diff/1/chrome/chrome.gyp File chrome/chrome.gyp (right): https://codereview.chromium.org/11365199/diff/1/chrome/chrome.gyp#newcode1054 chrome/chrome.gyp:1054: '../content/content.gyp:web_contents_delegate_android_java', On 2012/11/12 17:24:40, John Abd-El-Malek wrote: > nit: ...
8 years, 1 month ago (2012-11-12 18:07:46 UTC) #3
Jói
LGTM Just a question to be sure: Did you not need to leave a forwarding ...
8 years, 1 month ago (2012-11-12 18:41:33 UTC) #4
John Knottenbelt
Thanks Joi, we don't need the forwarding header because downstream depends on chrome/browser/android/chrome_web_contents_delegate_android.h (which thankfully ...
8 years, 1 month ago (2012-11-13 10:03:29 UTC) #5
Jói
Cool, LGTM. On Tue, Nov 13, 2012 at 10:03 AM, <jknotten@chromium.org> wrote: > Thanks Joi, ...
8 years, 1 month ago (2012-11-13 10:49:25 UTC) #6
joth
lgtm for android_webview https://codereview.chromium.org/11365199/diff/7003/build/android/findbugs_filter/findbugs_known_bugs.txt File build/android/findbugs_filter/findbugs_known_bugs.txt (right): https://codereview.chromium.org/11365199/diff/7003/build/android/findbugs_filter/findbugs_known_bugs.txt#newcode190 build/android/findbugs_filter/findbugs_known_bugs.txt:190: M P UPM: Private method org.chromium.content.components.web_contents_delegate_android.WebContentsDelegateAndroid.onLoadProgressChanged(double) ...
8 years, 1 month ago (2012-11-13 19:26:14 UTC) #7
John Knottenbelt
https://codereview.chromium.org/11365199/diff/7003/build/android/findbugs_filter/findbugs_known_bugs.txt File build/android/findbugs_filter/findbugs_known_bugs.txt (right): https://codereview.chromium.org/11365199/diff/7003/build/android/findbugs_filter/findbugs_known_bugs.txt#newcode190 build/android/findbugs_filter/findbugs_known_bugs.txt:190: M P UPM: Private method org.chromium.content.components.web_contents_delegate_android.WebContentsDelegateAndroid.onLoadProgressChanged(double) is never called ...
8 years, 1 month ago (2012-11-14 10:53:28 UTC) #8
John Knottenbelt
https://codereview.chromium.org/11365199/diff/7003/build/android/findbugs_filter/findbugs_known_bugs.txt File build/android/findbugs_filter/findbugs_known_bugs.txt (right): https://codereview.chromium.org/11365199/diff/7003/build/android/findbugs_filter/findbugs_known_bugs.txt#newcode190 build/android/findbugs_filter/findbugs_known_bugs.txt:190: M P UPM: Private method org.chromium.content.components.web_contents_delegate_android.WebContentsDelegateAndroid.onLoadProgressChanged(double) is never called ...
8 years, 1 month ago (2012-11-14 12:22:59 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jknotten@chromium.org/11365199/10006
8 years, 1 month ago (2012-11-14 12:26:07 UTC) #10
commit-bot: I haz the power
Change committed as 167670
8 years, 1 month ago (2012-11-14 14:05:17 UTC) #11
joth
8 years, 1 month ago (2012-11-14 17:33:36 UTC) #12
On 14 November 2012 04:22, <jknotten@chromium.org> wrote:

>
> https://codereview.chromium.**org/11365199/diff/7003/build/**
>
android/findbugs_filter/**findbugs_known_bugs.txt<https://codereview.chromium.org/11365199/diff/7003/build/android/findbugs_filter/findbugs_known_bugs.txt>
> File build/android/findbugs_filter/**findbugs_known_bugs.txt (right):
>
> https://codereview.chromium.**org/11365199/diff/7003/build/**
>
android/findbugs_filter/**findbugs_known_bugs.txt#**newcode190<https://codereview.chromium.org/11365199/diff/7003/build/android/findbugs_filter/findbugs_known_bugs.txt#newcode190>
> build/android/findbugs_filter/**findbugs_known_bugs.txt:190: M P UPM:
> Private method
> org.chromium.content.**components.web_contents_**delegate_android.**
> WebContentsDelegateAndroid.**onLoadProgressChanged(double)
> is never called  At WebContentsDelegateAndroid.**java
> I investigated this some more. The warning disappears if I rename the
> onLoadProgressChanged(double) to some other method name, e.g.
> onLoadProgressChangedInternal(**double). This seems pretty crazy to me,
> and perhaps related to onLoadProgressInternal having two overloads.
>
> Happy to make such a change to the code (but separately to this CL) if
> you recommend it.
>
>
> Yes, changing the name wouldn't be a bad idea anyway, as it will help make
it clearer what's good for subclasses vs what's internal detail. (we could
move the private method to the end too).
notifyLoadProgressChange or onLPCInternal are Ok with me.

Thanks!





>  On 2012/11/14 10:53:28, John Knottenbelt wrote:
>
>> On 2012/11/13 19:26:14, joth wrote:
>> > I'm surprised this is the only example of this warning we have...
>>
> there are
>
>> many
>> > other @CalledByNative private methods.
>> > *shrug*
>>
>
>  Indeed, it is rather mysterious. Will take a look to see if I can see
>>
> why
>
>> findbugs is identifying this particular case and not others.
>>
>
>
https://codereview.chromium.**org/11365199/<https://codereview.chromium.org/1...
>

Powered by Google App Engine
This is Rietveld 408576698