chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.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/BookmarkManager.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/BookmarkItemsAdapter.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.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/BookmarkManager.java

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

index 3d604f372bb54b370df2f8d00242cbfd58599117..3fe1b0bd94328a5b28527bd51b5dc2e2a738726c 100644

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

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

@@ -118,15 +118,15 @@ public class BookmarkManager implements BookmarkDelegate {

mIsDialogUi = isDialogUi;

mBookmarkModel = new BookmarkModel();

- mMainView = (ViewGroup) mActivity.getLayoutInflater().inflate(R.layout.eb_main, null);

- mDrawer = (DrawerLayout) mMainView.findViewById(R.id.eb_drawer_layout);

+ mMainView = (ViewGroup) mActivity.getLayoutInflater().inflate(R.layout.bookmark_main, null);

+ mDrawer = (DrawerLayout) mMainView.findViewById(R.id.bookmark_drawer_layout);

mDrawerListView = (BookmarkDrawerListView) mMainView.findViewById(

- R.id.eb_drawer_list);

- mContentView = (BookmarkContentView) mMainView.findViewById(R.id.eb_content_view);

- mViewSwitcher = (ViewSwitcher) mMainView.findViewById(R.id.eb_view_switcher);

+ R.id.bookmark_drawer_list);

+ mContentView = (BookmarkContentView) mMainView.findViewById(R.id.bookmark_content_view);

+ mViewSwitcher = (ViewSwitcher) mMainView.findViewById(R.id.bookmark_view_switcher);

mUndoController = new BookmarkUndoController(activity, mBookmarkModel,

((SnackbarManageable) activity).getSnackbarManager());

- mSearchView = (BookmarkSearchView) getView().findViewById(R.id.eb_search_view);

+ mSearchView = (BookmarkSearchView) getView().findViewById(R.id.bookmark_search_view);

mBookmarkModel.addObserver(mBookmarkModelObserver);

initializeToLoadingState();

mBookmarkModel.runAfterBookmarkModelLoaded(mModelLoadedRunnable);