chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkContentView.java - Issue 1694093003: Rename EnhancedBookmarks to Bookmarks, part 2.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

Patch Set: rebase 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBookmarkRow.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkContentView.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkContentView.java

index 4a406392a2c801b25a2c3d4bf2366457852a96c8..d27f44eee22c9d57dda7a033d57fc43d820b1520 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkContentView.java

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

@@ -43,18 +43,18 @@ public class BookmarkContentView extends RelativeLayout implements

@Override

protected void onFinishInflate() {

super.onFinishInflate();

- mItemsContainer = (BookmarkRecyclerView) findViewById(R.id.eb_items_container);

- TextView emptyView = (TextView) findViewById(R.id.eb_empty_view);

+ mItemsContainer = (BookmarkRecyclerView) findViewById(R.id.bookmark_items_container);

+ TextView emptyView = (TextView) findViewById(R.id.bookmark_empty_view);

emptyView.setText(OfflinePageUtils.getStringId(R.string.bookmarks_folder_empty));

mItemsContainer.setEmptyView(emptyView);

- mActionBar = (BookmarkActionBar) findViewById(R.id.eb_action_bar);

- mLoadingView = (LoadingView) findViewById(R.id.eb_initial_loading_view);

+ mActionBar = (BookmarkActionBar) findViewById(R.id.bookmark_action_bar);

+ mLoadingView = (LoadingView) findViewById(R.id.bookmark_initial_loading_view);

FadingShadowView shadow = (FadingShadowView) findViewById(R.id.shadow);

if (DeviceFormFactor.isLargeTablet(getContext())) {

shadow.setVisibility(View.GONE);

} else {

shadow.init(ApiCompatibilityUtils.getColor(getResources(),

- R.color.enhanced_bookmark_app_bar_shadow_color), FadingShadow.POSITION_TOP);

+ R.color.bookmark_app_bar_shadow_color), FadingShadow.POSITION_TOP);

}