chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.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/ChromeActivity.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/BookmarksBridge.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/enhanced_bookmarks/EnhancedBookmarksBridge.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/ChromeActivity.java

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

index 3f6b891bee4cb8e5d2ae5bcf95e1221b9c40cb41..6c25642cb29920d990dde52646835305542e155c 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -72,8 +72,8 @@ import org.chromium.chrome.browser.device.DeviceClassManager;

import org.chromium.chrome.browser.dom_distiller.DistilledPagePrefsView;

import org.chromium.chrome.browser.dom_distiller.ReaderModeActivityDelegate;

import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;

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

import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkUtils;

+import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarksModel;

import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;

import org.chromium.chrome.browser.gsa.ContextReporter;

import org.chromium.chrome.browser.gsa.GSAServiceClient;

@@ -885,14 +885,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

EnhancedBookmarkUtils.startEditActivity(ChromeActivity.this,

new BookmarkId(bookmarkId, BookmarkType.NORMAL));

}

- bookmarkModel.removeModelObserver(this);

+ bookmarkModel.removeObserver(this);

}

};

if (bookmarkModel.isBookmarkModelLoaded()) {

modelObserver.bookmarkModelLoaded();

} else {

- bookmarkModel.addModelObserver(modelObserver);

+ bookmarkModel.addObserver(modelObserver);

}

} else {

Intent intent = new Intent(this, ManageBookmarkActivity.class);