diff options
| author | Bart Sears <bsears@google.com> | 2014-09-04 01:21:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 01:21:42 +0000 |
| commit | 8dc9a9d1217f84a7f9b0554f22a826394eabc856 (patch) | |
| tree | 971b36fedff9796cfbf01c132598ea99ba9f624e | |
| parent | 04cc2fafb1103e5d9d9947e899ce4bb285b00b52 (diff) | |
| parent | e73e669ac73b2ddc042e380cd784ba8bd39ebb95 (diff) | |
| download | android_frameworks_webview-8dc9a9d1217f84a7f9b0554f22a826394eabc856.tar.gz android_frameworks_webview-8dc9a9d1217f84a7f9b0554f22a826394eabc856.tar.bz2 android_frameworks_webview-8dc9a9d1217f84a7f9b0554f22a826394eabc856.zip | |
Merge "Update some content classes to content_public" into chromium-dev
3 files changed, 3 insertions, 3 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebBackForwardListChromium.java b/chromium/java/com/android/webview/chromium/WebBackForwardListChromium.java index ad2b64b..b584ee9 100644 --- a/chromium/java/com/android/webview/chromium/WebBackForwardListChromium.java +++ b/chromium/java/com/android/webview/chromium/WebBackForwardListChromium.java @@ -16,7 +16,7 @@ package com.android.webview.chromium; -import org.chromium.content.browser.NavigationHistory; +import org.chromium.content_public.browser.NavigationHistory; import android.webkit.WebBackForwardList; import android.webkit.WebHistoryItem; diff --git a/chromium/java/com/android/webview/chromium/WebHistoryItemChromium.java b/chromium/java/com/android/webview/chromium/WebHistoryItemChromium.java index 18ab645..e36384b 100644 --- a/chromium/java/com/android/webview/chromium/WebHistoryItemChromium.java +++ b/chromium/java/com/android/webview/chromium/WebHistoryItemChromium.java @@ -16,7 +16,7 @@ package com.android.webview.chromium; -import org.chromium.content.browser.NavigationEntry; +import org.chromium.content_public.browser.NavigationEntry; import android.graphics.Bitmap; import android.webkit.WebHistoryItem; diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java index bc6bec4..763502a 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromium.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java @@ -66,7 +66,7 @@ import org.chromium.android_webview.AwLayoutSizer; import org.chromium.android_webview.AwSettings; import org.chromium.android_webview.AwPrintDocumentAdapter; import org.chromium.base.ThreadUtils; -import org.chromium.content.browser.LoadUrlParams; +import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.net.NetworkChangeNotifier; import java.io.BufferedWriter; |