Rename EnhancedBookmarks to Bookmarks, part 1.

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRecyclerView.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.enhancedbookmarks;
+package org.chromium.chrome.browser.bookmarks;
 
 import android.content.Context;
 import android.graphics.Rect;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Checkable;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.components.bookmarks.BookmarkId;
 
 import java.util.List;
 
 /**
  * Container for all bookmark items shown in enhanced bookmark manager.
  */
-public class EnhancedBookmarkRecyclerView extends RecyclerView implements
-        EnhancedBookmarkUIObserver {
+public class BookmarkRecyclerView extends RecyclerView implements
+        BookmarkUIObserver {
 
-    private EnhancedBookmarkDelegate mDelegate;
+    private BookmarkDelegate mDelegate;
     private View mEmptyView;
 
     /**
      * Provides a way to override the default spacing between 2 items in RecyclerView.
      */
     private static class VerticalSpaceItemDecoration extends RecyclerView.ItemDecoration {
         private final int mSpacing;
 
         public VerticalSpaceItemDecoration(int spacing) {
             this.mSpacing = spacing;
         }
 
         @Override
         public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
                 RecyclerView.State state) {
             outRect.bottom = mSpacing;
         }
     }
 
     /**
      * Constructs a new instance of enhanced bookmark recycler view.
      */
-    public EnhancedBookmarkRecyclerView(Context context, AttributeSet attrs) {
+    public BookmarkRecyclerView(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         setLayoutManager(new LinearLayoutManager(context));
         setHasFixedSize(true);
     }
 
     /**
      * Sets the view to be shown if there are no items in adapter.
      */
     void setEmptyView(View emptyView) {
@@ skipping 22 matching lines @@
             public void onItemRangeRemoved(int positionStart, int itemCount) {
                 super.onItemRangeRemoved(positionStart, itemCount);
                 updateEmptyViewVisibility(adapter);
             }
         });
         updateEmptyViewVisibility(adapter);
     }
 
     @VisibleForTesting
     @Override
-    public EnhancedBookmarkItemsAdapter getAdapter() {
-        return (EnhancedBookmarkItemsAdapter) super.getAdapter();
+    public BookmarkItemsAdapter getAdapter() {
+        return (BookmarkItemsAdapter) super.getAdapter();
     }
 
     /**
      * Unlike ListView or GridView, RecyclerView does not provide default empty
      * view implementation. We need to check it ourselves.
      */
     private void updateEmptyViewVisibility(Adapter adapter) {
         mEmptyView.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
     }
 
-    // EnhancedBookmarkUIObserver implementations
+    // BookmarkUIObserver implementations
 
     @Override
-    public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {
+    public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         mDelegate = delegate;
         mDelegate.addUIObserver(this);
 
-        EnhancedBookmarkItemsAdapter adapter = new EnhancedBookmarkItemsAdapter(getContext());
-        adapter.onEnhancedBookmarkDelegateInitialized(mDelegate);
+        BookmarkItemsAdapter adapter = new BookmarkItemsAdapter(getContext());
+        adapter.onBookmarkDelegateInitialized(mDelegate);
         setAdapter(adapter);
     }
 
     @Override
     public void onDestroy() {
         mDelegate.removeUIObserver(this);
     }
 
     @Override
     public void onAllBookmarksStateSet() {
         scrollToPosition(0);
     }
 
     @Override
     public void onFolderStateSet(BookmarkId folder) {
         scrollToPosition(0);
     }
 
     @Override
-    public void onFilterStateSet(EnhancedBookmarkFilter filter) {
-        assert filter == EnhancedBookmarkFilter.OFFLINE_PAGES;
+    public void onFilterStateSet(BookmarkFilter filter) {
+        assert filter == BookmarkFilter.OFFLINE_PAGES;
         scrollToPosition(0);
     }
 
     @Override
     public void onSelectionStateChange(List<BookmarkId> selectedBookmarks) {
         if (!mDelegate.isSelectionEnabled()) {
             for (int i = 0; i < getLayoutManager().getChildCount(); ++i) {
                 View child = getLayoutManager().getChildAt(i);
                 if (child instanceof Checkable) ((Checkable) child).setChecked(false);
             }
         }
     }
 
     @VisibleForTesting
-    public EnhancedBookmarkDelegate getDelegateForTesting() {
+    public BookmarkDelegate getDelegateForTesting() {
         return mDelegate;
     }
 }