chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListView.java - Issue 1440623004: [Enhanced Bookmark]Rewrite initialization logic

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListView.java

Issue 1440623004: [Enhanced Bookmark]Rewrite initialization logic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added another class: EBUIState. All EB will be remaned to B this month. Created 5 years 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/EnhancedBookmarkDelegate.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListViewAdapter.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFilter.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListView.java

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

index b7775629e46b7c5e247c56a716c372e08012763b..32aac9744fc26bb890ead53e810bd06f6be3de1c 100644

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

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

@@ -13,7 +13,6 @@ import android.widget.ListView;

import org.chromium.base.metrics.RecordHistogram;

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

-import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkManager.UIState;

import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;

import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;

import org.chromium.components.bookmarks.BookmarkId;

@@ -54,11 +53,11 @@ class EnhancedBookmarkDrawerListView extends ListView implements EnhancedBookmar

int currentState = mDelegate.getCurrentState();

boolean isConnected = OfflinePageUtils.isConnected(context);

if (item.mType == EnhancedBookmarkDrawerListViewAdapter.TYPE_FILTER

- && currentState != UIState.STATE_FILTER) {

+ && currentState != EnhancedBookmarkUIState.STATE_FILTER) {

RecordHistogram.recordBooleanHistogram(

"OfflinePages.Filter.OnlineWhenEntering", isConnected);

} else if (item.mType != EnhancedBookmarkDrawerListViewAdapter.TYPE_FILTER

- && currentState == UIState.STATE_FILTER) {

+ && currentState == EnhancedBookmarkUIState.STATE_FILTER) {

RecordHistogram.recordBooleanHistogram(

"OfflinePages.Filter.OnlineWhenLeaving", isConnected);

}

@@ -106,21 +105,22 @@ class EnhancedBookmarkDrawerListView extends ListView implements EnhancedBookmar

@Override

public void onAllBookmarksStateSet() {

mAdapter.updateList();

- setItemChecked(mAdapter.getItemPosition(UIState.STATE_ALL_BOOKMARKS, null),

+ setItemChecked(mAdapter.getItemPosition(EnhancedBookmarkUIState.STATE_ALL_BOOKMARKS, null),

true);

}

@Override

public void onFolderStateSet(BookmarkId folder) {

mAdapter.updateList();

- setItemChecked(mAdapter.getItemPosition(UIState.STATE_FOLDER, folder),

+ setItemChecked(mAdapter.getItemPosition(EnhancedBookmarkUIState.STATE_FOLDER, folder),

true);

}

@Override

public void onFilterStateSet(EnhancedBookmarkFilter filter) {

mAdapter.updateList();

- setItemChecked(mAdapter.getItemPosition(UIState.STATE_FILTER, filter), true);

+ setItemChecked(mAdapter.getItemPosition(EnhancedBookmarkUIState.STATE_FILTER, filter),

+ true);

}

@Override