chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java - Issue 1688033002: Rename EnhancedBookmarks to Bookmarks, part 1.

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java

Issue 1688033002: Rename EnhancedBookmarks to Bookmarks, part 1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemHighlightView.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkLaunchLocation.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarksModel.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java

similarity index 84%

rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java

rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java

index a5c979cc8def38915aceb134e022d12be1ceb609..f35a5cadd4933e6f317c0d08584bcd38c57639bb 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-package org.chromium.chrome.browser.enhancedbookmarks;

+package org.chromium.chrome.browser.bookmarks;

import android.content.Context;

import android.support.v7.widget.RecyclerView;

@@ -16,7 +16,7 @@ import org.chromium.base.metrics.RecordHistogram;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkItem;

import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkModelObserver;

-import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkPromoHeader.PromoHeaderShowingChangeListener;

+import org.chromium.chrome.browser.bookmarks.BookmarkPromoHeader.PromoHeaderShowingChangeListener;

import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;

import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageModelObserver;

import org.chromium.chrome.browser.offlinepages.OfflinePageFreeUpSpaceCallback;

@@ -30,17 +30,17 @@ import java.util.List;

/**

* BaseAdapter for EnhancedBookmarkItemsContainer. It manages bookmarks to list there.

-class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements

- EnhancedBookmarkUIObserver, PromoHeaderShowingChangeListener {

+class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements

+ BookmarkUIObserver, PromoHeaderShowingChangeListener {

private static final int PROMO_HEADER_VIEW = 0;

private static final int FOLDER_VIEW = 1;

private static final int DIVIDER_VIEW = 2;

private static final int BOOKMARK_VIEW = 3;

private static final int OFFLINE_PAGES_STORAGE_VIEW = 4;

- private EnhancedBookmarkDelegate mDelegate;

+ private BookmarkDelegate mDelegate;

private Context mContext;

- private EnhancedBookmarkPromoHeader mPromoHeaderManager;

+ private BookmarkPromoHeader mPromoHeaderManager;

private OfflinePageStorageSpaceHeader mOfflineStorageHeader;

private List<List<? extends Object>> mSections;

@@ -62,7 +62,7 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie

public void bookmarkNodeRemoved(BookmarkItem parent, int oldIndex, BookmarkItem node,

boolean isDoingExtensiveChanges) {

if (node.isFolder()) {

- mDelegate.notifyStateChange(EnhancedBookmarkItemsAdapter.this);

+ mDelegate.notifyStateChange(BookmarkItemsAdapter.this);

} else {

int deletedPosition = getPositionForBookmark(node.getId());

if (deletedPosition >= 0) {

@@ -73,13 +73,13 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie

@Override

public void bookmarkModelChanged() {

- mDelegate.notifyStateChange(EnhancedBookmarkItemsAdapter.this);

+ mDelegate.notifyStateChange(BookmarkItemsAdapter.this);

}

};

private OfflinePageModelObserver mOfflinePageModelObserver;

- EnhancedBookmarkItemsAdapter(Context context) {

+ BookmarkItemsAdapter(Context context) {

mContext = context;

mSections = new ArrayList<>();

@@ -215,14 +215,14 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie

return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(

R.layout.eb_divider, parent, false)) {};

case FOLDER_VIEW:

- EnhancedBookmarkFolderRow folder = (EnhancedBookmarkFolderRow) LayoutInflater

+ BookmarkFolderRow folder = (BookmarkFolderRow) LayoutInflater

.from(parent.getContext()).inflate(R.layout.eb_folder_row, parent, false);

- folder.onEnhancedBookmarkDelegateInitialized(mDelegate);

+ folder.onBookmarkDelegateInitialized(mDelegate);

return new ItemViewHolder(folder);

case BOOKMARK_VIEW:

- EnhancedBookmarkBookmarkRow item = (EnhancedBookmarkBookmarkRow) LayoutInflater

+ BookmarkBookmarkRow item = (BookmarkBookmarkRow) LayoutInflater

.from(parent.getContext()).inflate(R.layout.eb_bookmark_row, parent, false);

- item.onEnhancedBookmarkDelegateInitialized(mDelegate);

+ item.onBookmarkDelegateInitialized(mDelegate);

return new ItemViewHolder(item);

default:

assert false;

@@ -241,10 +241,10 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie

case DIVIDER_VIEW:

break;

case FOLDER_VIEW:

- ((EnhancedBookmarkRow) holder.itemView).setBookmarkId(id);

+ ((BookmarkRow) holder.itemView).setBookmarkId(id);

break;

case BOOKMARK_VIEW:

- ((EnhancedBookmarkRow) holder.itemView).setBookmarkId(id);

+ ((BookmarkRow) holder.itemView).setBookmarkId(id);

break;

default:

assert false : "View type not supported!";

@@ -255,8 +255,8 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie

@Override

public void onPromoHeaderShowingChanged(boolean isShowing) {

- if (mDelegate.getCurrentState() != EnhancedBookmarkUIState.STATE_ALL_BOOKMARKS

- && mDelegate.getCurrentState() != EnhancedBookmarkUIState.STATE_FOLDER) {

+ if (mDelegate.getCurrentState() != BookmarkUIState.STATE_ALL_BOOKMARKS

+ && mDelegate.getCurrentState() != BookmarkUIState.STATE_FOLDER) {

return;

}

@@ -265,25 +265,25 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie

notifyDataSetChanged();

}

- // EnhancedBookmarkUIObserver implementations.

+ // BookmarkUIObserver implementations.

@Override

- public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {

+ public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {

mDelegate = delegate;

mDelegate.addUIObserver(this);

mDelegate.getModel().addObserver(mBookmarkModelObserver);

- mPromoHeaderManager = new EnhancedBookmarkPromoHeader(mContext, this);

+ mPromoHeaderManager = new BookmarkPromoHeader(mContext, this);

OfflinePageBridge offlinePageBridge = mDelegate.getModel().getOfflinePageBridge();

if (offlinePageBridge != null) {

mOfflinePageModelObserver = new OfflinePageModelObserver() {

@Override

public void offlinePageModelChanged() {

- mDelegate.notifyStateChange(EnhancedBookmarkItemsAdapter.this);

+ mDelegate.notifyStateChange(BookmarkItemsAdapter.this);

}

@Override

public void offlinePageDeleted(BookmarkId bookmarkId) {

- if (mDelegate.getCurrentState() == EnhancedBookmarkUIState.STATE_FILTER) {

+ if (mDelegate.getCurrentState() == BookmarkUIState.STATE_FILTER) {

int deletedPosition = getPositionForBookmark(bookmarkId);

if (deletedPosition >= 0) {

removeItem(deletedPosition);

@@ -340,8 +340,8 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie

}

@Override

- public void onFilterStateSet(EnhancedBookmarkFilter filter) {

- assert filter == EnhancedBookmarkFilter.OFFLINE_PAGES;

+ public void onFilterStateSet(BookmarkFilter filter) {

+ assert filter == BookmarkFilter.OFFLINE_PAGES;

List<BookmarkId> bookmarkIds = mDelegate.getModel().getBookmarkIDsByFilter(filter);

RecordHistogram.recordCountHistogram("OfflinePages.OfflinePageCount", bookmarkIds.size());

setBookmarks(null, mDelegate.getModel().getBookmarkIDsByFilter(filter));

@@ -359,17 +359,17 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie

private void updateHeader() {

int currentUIState = mDelegate.getCurrentState();

- if (currentUIState == EnhancedBookmarkUIState.STATE_LOADING) return;

+ if (currentUIState == BookmarkUIState.STATE_LOADING) return;

mPromoHeaderSection.clear();

mOfflineStorageSection.clear();

- if (currentUIState == EnhancedBookmarkUIState.STATE_FILTER) {

+ if (currentUIState == BookmarkUIState.STATE_FILTER) {

if (mOfflineStorageHeader != null && mOfflineStorageHeader.shouldShow()) {

mOfflineStorageSection.add(null);

}

} else {

- assert currentUIState == EnhancedBookmarkUIState.STATE_ALL_BOOKMARKS

- || currentUIState == EnhancedBookmarkUIState.STATE_FOLDER

+ assert currentUIState == BookmarkUIState.STATE_ALL_BOOKMARKS

+ || currentUIState == BookmarkUIState.STATE_FOLDER

: "Unexpected UI state";

if (mPromoHeaderManager.shouldShow()) {

mPromoHeaderSection.add(null);

@@ -378,8 +378,8 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie

}

private void refreshOfflinePagesFilterView() {

- if (mDelegate.getCurrentState() != EnhancedBookmarkUIState.STATE_FILTER) return;

+ if (mDelegate.getCurrentState() != BookmarkUIState.STATE_FILTER) return;

setBookmarks(null,

- mDelegate.getModel().getBookmarkIDsByFilter(EnhancedBookmarkFilter.OFFLINE_PAGES));

+ mDelegate.getModel().getBookmarkIDsByFilter(BookmarkFilter.OFFLINE_PAGES));

}