chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.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/EnhancedBookmarkAddEditFolderActivity.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/EnhancedBookmarkActionBar.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkBookmarkRow.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/EnhancedBookmarkAddEditFolderActivity.java

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

index be1b5d4ef4fbb137ec950d63a0c2e3c246babd9d..d11691820543d0421c8067cb722ea68f4b47a36e 100644

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

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

@@ -17,7 +17,6 @@ import android.widget.TextView;

import org.chromium.chrome.R;

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

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

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

import org.chromium.chrome.browser.widget.EmptyAlertEditText;

import org.chromium.chrome.browser.widget.TintedDrawable;

import org.chromium.components.bookmarks.BookmarkId;

@@ -116,7 +115,7 @@ public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActiv

EnhancedBookmarkUtils.setTaskDescriptionInDocumentMode(this,

getString(R.string.enhanced_bookmark_action_bar_edit_folder));

mModel = new EnhancedBookmarksModel();

- mModel.addModelObserver(mBookmarkModelObserver);

+ mModel.addObserver(mBookmarkModelObserver);

mIsAddMode = getIntent().getBooleanExtra(INTENT_IS_ADD_MODE, false);

if (mIsAddMode) {

List<String> stringList = getIntent().getStringArrayListExtra(

@@ -226,7 +225,7 @@ public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActiv

@Override

protected void onDestroy() {

super.onDestroy();

- mModel.removeModelObserver(mBookmarkModelObserver);

+ mModel.removeObserver(mBookmarkModelObserver);

mModel.destroy();

mModel = null;

}