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

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 659493003: Final step of the java_cpp_template -> java_cpp_enum migration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete some more template files Created 6 years, 2 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | android_webview/native/aw_contents.cc » ('j') | base/base.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « no previous file | android_webview/native/aw_contents.cc » ('j') | base/base.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698