Commit c3d99a2c authored by Brandon Wylie's avatar Brandon Wylie Committed by Commit Bot

Remove ChromeActivity reference from BookmarkUtils

Bug: 1123209
Change-Id: Ia457b50bd07fe007158a7169c449b8be4cf3d92d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2492662Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821550}
parent e1776429
...@@ -68,9 +68,6 @@ specific_include_rules = { ...@@ -68,9 +68,6 @@ specific_include_rules = {
"CardUnmaskPrompt\.java": [ "CardUnmaskPrompt\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
], ],
"BookmarkUtils\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
],
"QualityEnforcer\.java": [ "QualityEnforcer\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
], ],
......
...@@ -22,7 +22,6 @@ import org.chromium.base.metrics.RecordUserAction; ...@@ -22,7 +22,6 @@ import org.chromium.base.metrics.RecordUserAction;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.IntentHandler;
import org.chromium.chrome.browser.app.ChromeActivity;
import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem; import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
import org.chromium.chrome.browser.document.ChromeLauncherActivity; import org.chromium.chrome.browser.document.ChromeLauncherActivity;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
...@@ -169,7 +168,7 @@ public class BookmarkUtils { ...@@ -169,7 +168,7 @@ public class BookmarkUtils {
* Shows bookmark main UI. * Shows bookmark main UI.
* @param activity An activity to start the manager with. * @param activity An activity to start the manager with.
*/ */
public static void showBookmarkManager(ChromeActivity activity) { public static void showBookmarkManager(Activity activity) {
ThreadUtils.assertOnUiThread(); ThreadUtils.assertOnUiThread();
String url = getFirstUrlToLoad(activity); String url = getFirstUrlToLoad(activity);
...@@ -186,8 +185,8 @@ public class BookmarkUtils { ...@@ -186,8 +185,8 @@ public class BookmarkUtils {
/** /**
* The initial url the bookmark manager shows depends some experiments we run. * The initial url the bookmark manager shows depends some experiments we run.
*/ */
private static String getFirstUrlToLoad(Activity activity) { private static String getFirstUrlToLoad(Context context) {
String lastUsedUrl = getLastUsedUrl(activity); String lastUsedUrl = getLastUsedUrl(context);
return TextUtils.isEmpty(lastUsedUrl) ? UrlConstants.BOOKMARKS_URL : lastUsedUrl; return TextUtils.isEmpty(lastUsedUrl) ? UrlConstants.BOOKMARKS_URL : lastUsedUrl;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment