Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListView.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListView.java
similarity index 65%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListView.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListView.java
index 32aac9744fc26bb890ead53e810bd06f6be3de1c..9442823a036bec8c412f40173cbc7177424d89f8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListView.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.annotation.SuppressLint;
 import android.content.Context;
@@ -24,20 +24,20 @@ import java.util.List;
  * modes and let users to choose.
  */
 @SuppressLint("Instantiatable")
-class EnhancedBookmarkDrawerListView extends ListView implements EnhancedBookmarkUIObserver {
-    private EnhancedBookmarkDelegate mDelegate;
+class BookmarkDrawerListView extends ListView implements BookmarkUIObserver {
+    private BookmarkDelegate mDelegate;
 
     private BookmarkModelObserver mBookmarkModelObserver = new BookmarkModelObserver() {
         @Override
         public void bookmarkModelChanged() {
-            mDelegate.notifyStateChange(EnhancedBookmarkDrawerListView.this);
+            mDelegate.notifyStateChange(BookmarkDrawerListView.this);
         }
     };
 
-    private final EnhancedBookmarkDrawerListViewAdapter mAdapter =
-            new EnhancedBookmarkDrawerListViewAdapter();
+    private final BookmarkDrawerListViewAdapter mAdapter =
+            new BookmarkDrawerListViewAdapter();
 
-    public EnhancedBookmarkDrawerListView(final Context context, AttributeSet attrs) {
+    public BookmarkDrawerListView(final Context context, AttributeSet attrs) {
         super(context, attrs);
 
         setAdapter(mAdapter);
@@ -46,31 +46,31 @@ class EnhancedBookmarkDrawerListView extends ListView implements EnhancedBookmar
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 mDelegate.closeDrawer();
 
-                EnhancedBookmarkDrawerListViewAdapter.Item item =
-                        (EnhancedBookmarkDrawerListViewAdapter.Item) mAdapter.getItem(position);
+                BookmarkDrawerListViewAdapter.Item item =
+                        (BookmarkDrawerListViewAdapter.Item) mAdapter.getItem(position);
 
                 if (OfflinePageBridge.isEnabled()) {
                     int currentState = mDelegate.getCurrentState();
                     boolean isConnected = OfflinePageUtils.isConnected(context);
-                    if (item.mType == EnhancedBookmarkDrawerListViewAdapter.TYPE_FILTER
-                            && currentState != EnhancedBookmarkUIState.STATE_FILTER) {
+                    if (item.mType == BookmarkDrawerListViewAdapter.TYPE_FILTER
+                            && currentState != BookmarkUIState.STATE_FILTER) {
                         RecordHistogram.recordBooleanHistogram(
                                 "OfflinePages.Filter.OnlineWhenEntering", isConnected);
-                    } else if (item.mType != EnhancedBookmarkDrawerListViewAdapter.TYPE_FILTER
-                            && currentState == EnhancedBookmarkUIState.STATE_FILTER) {
+                    } else if (item.mType != BookmarkDrawerListViewAdapter.TYPE_FILTER
+                            && currentState == BookmarkUIState.STATE_FILTER) {
                         RecordHistogram.recordBooleanHistogram(
                                 "OfflinePages.Filter.OnlineWhenLeaving", isConnected);
                     }
                 }
 
                 switch (item.mType) {
-                    case EnhancedBookmarkDrawerListViewAdapter.TYPE_FOLDER:
+                    case BookmarkDrawerListViewAdapter.TYPE_FOLDER:
                         mDelegate.openFolder(item.mFolderId);
                         break;
-                    case EnhancedBookmarkDrawerListViewAdapter.TYPE_ALL_ITEMS:
+                    case BookmarkDrawerListViewAdapter.TYPE_ALL_ITEMS:
                         mDelegate.openAllBookmarks();
                         break;
-                    case EnhancedBookmarkDrawerListViewAdapter.TYPE_FILTER:
+                    case BookmarkDrawerListViewAdapter.TYPE_FILTER:
                         mDelegate.openFilter(item.mFilter);
                         break;
                     default:
@@ -86,10 +86,10 @@ class EnhancedBookmarkDrawerListView extends ListView implements EnhancedBookmar
         clearChoices();
     }
 
-    // EnhancedBookmarkUIObserver implementations.
+    // BookmarkUIObserver implementations.
 
     @Override
-    public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {
+    public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         mDelegate = delegate;
         delegate.getModel().addObserver(mBookmarkModelObserver);
         mAdapter.setEnhancedBookmarkUIDelegate(delegate);
@@ -105,21 +105,21 @@ class EnhancedBookmarkDrawerListView extends ListView implements EnhancedBookmar
     @Override
     public void onAllBookmarksStateSet() {
         mAdapter.updateList();
-        setItemChecked(mAdapter.getItemPosition(EnhancedBookmarkUIState.STATE_ALL_BOOKMARKS, null),
+        setItemChecked(mAdapter.getItemPosition(BookmarkUIState.STATE_ALL_BOOKMARKS, null),
                 true);
     }
 
     @Override
     public void onFolderStateSet(BookmarkId folder) {
         mAdapter.updateList();
-        setItemChecked(mAdapter.getItemPosition(EnhancedBookmarkUIState.STATE_FOLDER, folder),
+        setItemChecked(mAdapter.getItemPosition(BookmarkUIState.STATE_FOLDER, folder),
                 true);
     }
 
     @Override
-    public void onFilterStateSet(EnhancedBookmarkFilter filter) {
+    public void onFilterStateSet(BookmarkFilter filter) {
         mAdapter.updateList();
-        setItemChecked(mAdapter.getItemPosition(EnhancedBookmarkUIState.STATE_FILTER, filter),
+        setItemChecked(mAdapter.getItemPosition(BookmarkUIState.STATE_FILTER, filter),
                 true);
     }