Chromium Code Reviews| Index: android_webview/java/src/org/chromium/android_webview/AwContents.java |
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java |
| index d8a2eeaeced48d8890354e32058ddc5c3ed7c440..f8ee039d8135cd543e267797e87a526c23a4a668 100644 |
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java |
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java |
| @@ -58,7 +58,7 @@ import org.chromium.content_public.browser.NavigationHistory; |
| import org.chromium.content_public.browser.WebContents; |
| import org.chromium.content_public.common.Referrer; |
| import org.chromium.ui.base.ActivityWindowAndroid; |
| -import org.chromium.ui.base.PageTransitionTypes; |
| +import org.chromium.ui.base.PageTransition; |
|
Yaron
2014/10/15 02:36:49
I bet this impacts the internal repo too. Can you
mkosiba (inactive)
2014/10/15 09:46:08
I know :) I was planning to prepare the matching p
|
| import org.chromium.ui.base.WindowAndroid; |
| import org.chromium.ui.gfx.DeviceDisplayInfo; |
| @@ -1115,11 +1115,11 @@ public class AwContents { |
| // If we are reloading the same url, then set transition type as reload. |
| if (params.getUrl() != null && |
| params.getUrl().equals(mWebContents.getUrl()) && |
| - params.getTransitionType() == PageTransitionTypes.PAGE_TRANSITION_LINK) { |
| - params.setTransitionType(PageTransitionTypes.PAGE_TRANSITION_RELOAD); |
| + params.getTransitionType() == PageTransition.LINK) { |
| + params.setTransitionType(PageTransition.RELOAD); |
| } |
| params.setTransitionType( |
| - params.getTransitionType() | PageTransitionTypes.PAGE_TRANSITION_FROM_API); |
| + params.getTransitionType() | PageTransition.FROM_API); |
| // For WebView, always use the user agent override, which is set |
| // every time the user agent in AwSettings is modified. |