chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java - Issue 1247033009: Clean up Enhanced Bookmark's data acquiring logic

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/enhancedbookmarks/EnhancedBookmarkManager.java

Issue 1247033009: Clean up Enhanced Bookmark's data acquiring logic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@icon_eb

Patch Set: Add correct files to git commits Created 5 years, 5 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/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUndoController.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/enhancedbookmarks/EnhancedBookmarkManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java

index 3d009d6ec4f4f4cbc02f3346bb2ecb96c240356f..8d7a6cfb6bb1bd8bf75d35dd64ebc659a464c2c8 100644

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

+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java

@@ -18,8 +18,6 @@ import org.chromium.chrome.R;

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

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

import org.chromium.chrome.browser.UrlConstants;

-import org.chromium.chrome.browser.enhanced_bookmarks.EnhancedBookmarksModel;

-import org.chromium.chrome.browser.enhanced_bookmarks.LaunchLocation;

import org.chromium.chrome.browser.ntp.NewTabPageUma;

import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;

import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;

@@ -109,7 +107,7 @@ public class EnhancedBookmarkManager implements EnhancedBookmarkDelegate {

mContentView = (EnhancedBookmarkContentView) mMainView.findViewById(R.id.eb_content_view);

mUndoController = new EnhancedBookmarkUndoController(activity, mEnhancedBookmarksModel,

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

- mEnhancedBookmarksModel.addModelObserver(mBookmarkModelObserver);

+ mEnhancedBookmarksModel.addObserver(mBookmarkModelObserver);

initializeIfBookmarkModelLoaded();

// Load partner bookmarks explicitly. We load partner bookmarks in the deferred startup

@@ -131,7 +129,7 @@ public class EnhancedBookmarkManager implements EnhancedBookmarkDelegate {

mUndoController.destroy();

mUndoController = null;

}

- mEnhancedBookmarksModel.removeModelObserver(mBookmarkModelObserver);

+ mEnhancedBookmarksModel.removeObserver(mBookmarkModelObserver);

mEnhancedBookmarksModel.destroy();

mEnhancedBookmarksModel = null;

}