Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkContentView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkContentView.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkContentView.java
similarity index 70%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkContentView.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkContentView.java
index 9f005035653221cb1cc6aafbbedd5808ed4f8a2c..4a406392a2c801b25a2c3d4bf2366457852a96c8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkContentView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkContentView.java
@@ -2,7 +2,7 @@
 // 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.util.AttributeSet;
@@ -22,32 +22,32 @@ import org.chromium.ui.base.DeviceFormFactor;
 import java.util.List;
 
 /**
- * A ViewGroup that holds an {@link EnhancedBookmarkActionBar}, a {@link FadingShadowView}, a
- * {@link EnhancedBookmarkRecyclerView} and a {@link LoadingView}.
+ * A ViewGroup that holds an {@link BookmarkActionBar}, a {@link FadingShadowView}, a
+ * {@link BookmarkRecyclerView} and a {@link LoadingView}.
  */
-public class EnhancedBookmarkContentView extends RelativeLayout implements
-        EnhancedBookmarkUIObserver {
-    private EnhancedBookmarkDelegate mDelegate;
-    private EnhancedBookmarkRecyclerView mItemsContainer;
-    private EnhancedBookmarkActionBar mActionBar;
+public class BookmarkContentView extends RelativeLayout implements
+        BookmarkUIObserver {
+    private BookmarkDelegate mDelegate;
+    private BookmarkRecyclerView mItemsContainer;
+    private BookmarkActionBar mActionBar;
     private LoadingView mLoadingView;
 
     /**
-     * Creates an instance of {@link EnhancedBookmarkContentView}. This constructor should be used
+     * Creates an instance of {@link BookmarkContentView}. This constructor should be used
      * by the framework when inflating from XML.
      */
-    public EnhancedBookmarkContentView(Context context, AttributeSet attrs) {
+    public BookmarkContentView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        mItemsContainer = (EnhancedBookmarkRecyclerView) findViewById(R.id.eb_items_container);
+        mItemsContainer = (BookmarkRecyclerView) findViewById(R.id.eb_items_container);
         TextView emptyView = (TextView) findViewById(R.id.eb_empty_view);
         emptyView.setText(OfflinePageUtils.getStringId(R.string.bookmarks_folder_empty));
         mItemsContainer.setEmptyView(emptyView);
-        mActionBar = (EnhancedBookmarkActionBar) findViewById(R.id.eb_action_bar);
+        mActionBar = (BookmarkActionBar) findViewById(R.id.eb_action_bar);
         mLoadingView = (LoadingView) findViewById(R.id.eb_initial_loading_view);
         FadingShadowView shadow = (FadingShadowView) findViewById(R.id.shadow);
         if (DeviceFormFactor.isLargeTablet(getContext())) {
@@ -76,14 +76,14 @@ public class EnhancedBookmarkContentView extends RelativeLayout implements
         mLoadingView.showLoadingUI();
     }
 
-    // EnhancedBookmarkUIObserver implementations.
+    // BookmarkUIObserver implementations.
 
     @Override
-    public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {
+    public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         mDelegate = delegate;
         mDelegate.addUIObserver(this);
-        mItemsContainer.onEnhancedBookmarkDelegateInitialized(mDelegate);
-        mActionBar.onEnhancedBookmarkDelegateInitialized(mDelegate);
+        mItemsContainer.onBookmarkDelegateInitialized(mDelegate);
+        mActionBar.onBookmarkDelegateInitialized(mDelegate);
     }
 
     @Override
@@ -102,7 +102,7 @@ public class EnhancedBookmarkContentView extends RelativeLayout implements
     }
 
     @Override
-    public void onFilterStateSet(EnhancedBookmarkFilter filter) {
+    public void onFilterStateSet(BookmarkFilter filter) {
         mLoadingView.hideLoadingUI();
     }