diff options
| author | Ben Murdoch <benm@google.com> | 2014-09-06 09:51:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-06 09:51:27 +0000 |
| commit | 82c4666db142d02aef0a52250134aebd26e905ec (patch) | |
| tree | 5e66c0ebb4cb47e0f79914360d7360e707077d7a /chromium/java/com/android/webview | |
| parent | 556ee2ee901252baba7a701c693b456bd799d433 (diff) | |
| parent | 318568c4b5933ce429c402d076bf65da69775706 (diff) | |
| download | webview-82c4666db142d02aef0a52250134aebd26e905ec.tar.gz | |
Merge "Update some content classes to content_public" into master-chromium
Diffstat (limited to 'chromium/java/com/android/webview')
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 2254265..a6111aa 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromium.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java @@ -69,7 +69,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; |