Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBookmarkRow.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkBookmarkRow.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBookmarkRow.java
similarity index 89%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkBookmarkRow.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBookmarkRow.java
index e54599b86956212ec5fff2e858965e0445c886e1..a46462251d9174d933353142ddf5f24512654f24 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkBookmarkRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBookmarkRow.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.graphics.Bitmap;
@@ -26,7 +26,7 @@ import org.chromium.components.bookmarks.BookmarkId;
 /**
  * A row view that shows bookmark info in the enhanced bookmarks UI.
  */
-public class EnhancedBookmarkBookmarkRow extends EnhancedBookmarkRow implements LargeIconCallback {
+public class BookmarkBookmarkRow extends BookmarkRow implements LargeIconCallback {
 
     private String mUrl;
     private RoundedIconGenerator mIconGenerator;
@@ -37,7 +37,7 @@ public class EnhancedBookmarkBookmarkRow extends EnhancedBookmarkRow implements
     /**
      * Constructor for inflating from XML.
      */
-    public EnhancedBookmarkBookmarkRow(Context context, AttributeSet attrs) {
+    public BookmarkBookmarkRow(Context context, AttributeSet attrs) {
         super(context, attrs);
         mCornerRadius = getResources().getDimensionPixelSize(
                 R.dimen.enhanced_bookmark_item_corner_radius);
@@ -53,22 +53,22 @@ public class EnhancedBookmarkBookmarkRow extends EnhancedBookmarkRow implements
                 mCornerRadius, iconColor, textSize);
     }
 
-    // EnhancedBookmarkRow implementation.
+    // BookmarkRow implementation.
 
     @Override
     public void onClick() {
         int launchLocation = -1;
         switch (mDelegate.getCurrentState()) {
-            case EnhancedBookmarkUIState.STATE_ALL_BOOKMARKS:
+            case BookmarkUIState.STATE_ALL_BOOKMARKS:
                 launchLocation = BookmarkLaunchLocation.ALL_ITEMS;
                 break;
-            case EnhancedBookmarkUIState.STATE_FOLDER:
+            case BookmarkUIState.STATE_FOLDER:
                 launchLocation = BookmarkLaunchLocation.FOLDER;
                 break;
-            case EnhancedBookmarkUIState.STATE_FILTER:
+            case BookmarkUIState.STATE_FILTER:
                 launchLocation = BookmarkLaunchLocation.FILTER;
                 break;
-            case EnhancedBookmarkUIState.STATE_LOADING:
+            case BookmarkUIState.STATE_LOADING:
                 assert false :
                         "The main content shouldn't be inflated if it's still loading";
                 break;
@@ -93,7 +93,7 @@ public class EnhancedBookmarkBookmarkRow extends EnhancedBookmarkRow implements
     private void updateOfflinePageSize(BookmarkId bookmarkId) {
         OfflinePageItem offlinePage = null;
         OfflinePageBridge bridge = mDelegate.getModel().getOfflinePageBridge();
-        if (mDelegate.getCurrentState() == EnhancedBookmarkUIState.STATE_FILTER && bridge != null) {
+        if (mDelegate.getCurrentState() == BookmarkUIState.STATE_FILTER && bridge != null) {
             offlinePage = bridge.getPageByBookmarkId(bookmarkId);
         }
         TextView textView = (TextView) findViewById(R.id.offline_page_size);