diff options
| author | grt <grt@chromium.org> | 2015-02-26 06:26:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-26 14:27:45 +0000 |
| commit | c2d96fa87b653355fc8335c0accecff8852cae5d (patch) | |
| tree | f4c0a61e47ed90ba37f2b2b9ba4d78dad1d80677 /components | |
| parent | 49001892c02a5287233acc68edaaf2e0dc981163 (diff) | |
| download | chromium_src-c2d96fa87b653355fc8335c0accecff8852cae5d.zip chromium_src-c2d96fa87b653355fc8335c0accecff8852cae5d.tar.gz chromium_src-c2d96fa87b653355fc8335c0accecff8852cae5d.tar.bz2 | |
Revert of [Android WebView] Synthesize a fake page loading event on page source modification (patchset #8 id:140001 of https://codereview.chromium.org/924833003/)
Reason for revert:
Reverting to see if this caused AwContentsClientFullScreenTest#testPowerSaveBlockerIsTransferredToFullscreen failure here: http://crbug.com/462213.
Original issue's description:
> [Android WebView] Synthesize a fake page loading event on page source modification
>
> When a script modifies page source of a non-committed page, we need to
> notify clients, so they can update the URL bar to avoid confusion.
>
> BUG=458569
>
> Committed: https://crrev.com/e38bb6cdeb1170cb2cd7faae8507dc6c34c58c7d
> Cr-Commit-Position: refs/heads/master@{#318222}
TBR=torne@chromium.org,tedchoc@chromium.org,davidben@chromium.org,creis@chromium.org,mnaganov@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=458569
Review URL: https://codereview.chromium.org/958933002
Cr-Commit-Position: refs/heads/master@{#318231}
Diffstat (limited to 'components')
| -rw-r--r-- | components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java index 1c774f0..5ada34b 100644 --- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java @@ -8,7 +8,6 @@ import android.view.KeyEvent; import org.chromium.base.CalledByNative; import org.chromium.base.JNINamespace; -import org.chromium.content_public.browser.InvalidateTypes; import org.chromium.content_public.browser.WebContents; /** @@ -26,8 +25,16 @@ public class WebContentsDelegateAndroid { // Equivalent of WebCore::WebConsoleMessage::LevelError. public static final int LOG_LEVEL_ERROR = 3; - // TODO(mnaganov): Remove after getting rid of downstream usages. - public static final int INVALIDATE_TYPE_TAB = InvalidateTypes.TAB; + // Flags passed to the WebContentsDelegateAndroid.navigationStateChanged to tell it + // what has changed. Should match the values in invalidate_type.h. + // Equivalent of InvalidateTypes::INVALIDATE_TYPE_URL. + public static final int INVALIDATE_TYPE_URL = 1 << 0; + // Equivalent of InvalidateTypes::INVALIDATE_TYPE_TAB. + public static final int INVALIDATE_TYPE_TAB = 1 << 1; + // Equivalent of InvalidateTypes::INVALIDATE_TYPE_LOAD. + public static final int INVALIDATE_TYPE_LOAD = 1 << 2; + // Equivalent of InvalidateTypes::INVALIDATE_TYPE_TITLE. + public static final int INVALIDATE_TYPE_TITLE = 1 << 3; // The most recent load progress callback received from WebContents, as a percentage. // Initialize to 100 to indicate that we're not in a loading state. |