Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/BookmarksPage.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/BookmarksPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/BookmarksPage.java |
index d5296fc243a2a82991132795d53fc401dd02c572..4663f260e738b281e7fdfa30bf807570075331eb 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/BookmarksPage.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/BookmarksPage.java |
@@ -50,8 +50,7 @@ public class BookmarksPage implements NativePage, InvalidationAwareThumbnailProv |
private static final String LAST_USED_BOOKMARK_FOLDER_ID = "last_used_folder_id"; |
private static final int PAGE_MODE_NORMAL = 0; |
- private static final int PAGE_MODE_SELECT_BOOKMARK = 1; |
- private static final int PAGE_MODE_DOCUMENT = 2; |
+ private static final int PAGE_MODE_DOCUMENT = 1; |
private final Profile mProfile; |
private BookmarksBridge mBookmarksBridge; |
@@ -103,18 +102,6 @@ public class BookmarksPage implements NativePage, InvalidationAwareThumbnailProv |
} |
/** |
- * Creates a BookmarksPage to be shown in the ShortcutActivity. |
- * @param context The view context for showing the page. |
- * @param profile The profile from which to load bookmarks. |
- * @param listener The BookmarkSelectedListener to notify when the user clicks a bookmark. |
- * @return The new BookmarksPage object. |
- */ |
- public static BookmarksPage buildPageInSelectBookmarkMode(Context context, |
- Profile profile, BookmarkSelectedListener listener) { |
- return new BookmarksPage(context, profile, null, null, listener, PAGE_MODE_SELECT_BOOKMARK); |
- } |
- |
- /** |
* Creates a BookmarksPage to be shown in document mode. |
* @param context The view context for showing the page. |
* @param tab The tab from which bookmarks page is loaded. |
@@ -314,9 +301,6 @@ public class BookmarksPage implements NativePage, InvalidationAwareThumbnailProv |
case PAGE_MODE_NORMAL: |
manager = buildManager(tab, tabModelSelector); |
break; |
- case PAGE_MODE_SELECT_BOOKMARK: |
- manager = buildManagerForSelectBookmarkMode(listener); |
- break; |
case PAGE_MODE_DOCUMENT: |
manager = buildManagerForDocumentMode(tab, tabModelSelector, listener); |
break; |
@@ -392,72 +376,6 @@ public class BookmarksPage implements NativePage, InvalidationAwareThumbnailProv |
return new DocumentModeManager(tab, tabModelSelector, listener); |
} |
- private BookmarksPageManager buildManagerForSelectBookmarkMode( |
- final BookmarkSelectedListener listener) { |
- return new BookmarksPageManager() { |
- @Override |
- public boolean isDestroyed() { |
- return mIsDestroyed; |
- } |
- |
- @Override |
- public boolean isIncognito() { |
- return false; |
- } |
- |
- @Override |
- public boolean shouldShowOpenInNewTab() { |
- return false; |
- } |
- |
- @Override |
- public boolean shouldShowOpenInNewIncognitoTab() { |
- return false; |
- } |
- |
- @Override |
- public boolean isContextMenuEnabled() { |
- return false; |
- } |
- |
- @Override |
- public void open(BookmarkItemView item) { |
- if (item.isFolder()) { |
- updateBookmarksPageContents(item.getBookmarkId(), false); |
- } else { |
- listener.onBookmarkSelected(item.getUrl(), item.getTitle(), item.getFavicon()); |
- } |
- } |
- |
- @Override |
- public void openInNewTab(BookmarkItemView item) { |
- } |
- |
- @Override |
- public void openInNewIncognitoTab(BookmarkItemView item) { |
- } |
- |
- @Override |
- public void openFolder(BookmarkFolderHierarchyItem item) { |
- updateBookmarksPageContents(item.getFolderId(), false); |
- } |
- |
- @Override |
- public void delete(BookmarkItemView item) { |
- } |
- |
- @Override |
- public void edit(BookmarkItemView item) { |
- } |
- |
- @Override |
- public void getFaviconImageForUrl( |
- String url, int size, FaviconImageCallback faviconCallback) { |
- BookmarksPage.this.getFaviconImageForUrl(url, size, faviconCallback); |
- } |
- }; |
- } |
- |
private void getFaviconImageForUrl(String url, int size, FaviconImageCallback faviconCallback) { |
if (mFaviconHelper == null) return; |
mFaviconHelper.getLocalFaviconImageForURL(mProfile, url, size, faviconCallback); |