Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.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.bookmarks;
 
 import android.content.Context;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
@@ skipping 38 matching lines @@
          * Called when the bookmark has been added.
          * @param bookmarkId ID of the bookmark that has been added.
          * @param result of saving an offline copy of the bookmarked page.
          */
         void onBookmarkAdded(BookmarkId bookmarkId, int saveResult);
     }
 
     /**
      * Observer that listens to delete event. This interface is used by undo controllers to know
      * which bookmarks were deleted. Note this observer only listens to events that go through
-     * enhanced bookmark model.
+     * bookmark model.
      */
     public interface BookmarkDeleteObserver {
 
         /**
          * Callback being triggered immediately before bookmarks are deleted.
          * @param titles All titles of the bookmarks to be deleted.
          * @param isUndoable Whether the deletion is undoable.
          */
         void onDeleteBookmarks(String[] titles, boolean isUndoable);
     }
@@ skipping 12 matching lines @@
                     }
                 }
             };
 
     private ObserverList<BookmarkDeleteObserver> mDeleteObservers = new ObserverList<>();
     private OfflinePageBridge mOfflinePageBridge;
     private boolean mIsOfflinePageModelLoaded;
     private OfflinePageModelObserver mOfflinePageModelObserver;
 
     /**
-     * Initialize enhanced bookmark model for last used non-incognito profile.
+     * Initialize bookmark model for last used non-incognito profile.
      */
     public BookmarkModel() {
         this(Profile.getLastUsedProfile().getOriginalProfile());
     }
 
     @VisibleForTesting
     public BookmarkModel(Profile profile) {
         super(profile);
 
         // Note: we check if mOfflinePageBridge is null after this to determine if offline pages
@@ skipping 32 matching lines @@
         super.destroy();
     }
 
     @Override
     public boolean isBookmarkModelLoaded() {
         return super.isBookmarkModelLoaded()
                 && (mOfflinePageBridge == null || mIsOfflinePageModelLoaded);
     }
 
     /**
-     * Add an observer that listens to delete events that go through enhanced bookmark model.
+     * Add an observer that listens to delete events that go through bookmark model.

[Ian Wen, 2016/02/16 22:15:43]

the bookmark model?

[newt (away), 2016/02/16 23:49:50]

Done.

      * @param observer The observer to add.
      */
     public void addDeleteObserver(BookmarkDeleteObserver observer) {
         mDeleteObservers.addObserver(observer);
     }
 
     /**
      * Remove the observer from listening to bookmark deleting events.
      * @param observer The observer to remove.
      */
@@ skipping 52 matching lines @@
      * @param index The position where the bookmark will be placed in parent folder
      * @param title Title of the new bookmark.
      * @param url Url of the new bookmark
      * @param webContents A {@link WebContents} object for saving the offline copy. If null, the
      *        saving should be skipped.
      * @param callback The callback to be invoked when the bookmark is added.
      */
     public void addBookmarkAsync(BookmarkId parent, int index, String title, String url,
                                  WebContents webContents, final AddBookmarkCallback callback) {
         url = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
-        final BookmarkId enhancedId = addBookmark(parent, index, title, url);
+        final BookmarkId bookmarkId = addBookmark(parent, index, title, url);
 
         // If there is no need to save offline page, return now.
         if (mOfflinePageBridge == null || webContents == null) {
-            callback.onBookmarkAdded(enhancedId, AddBookmarkCallback.SKIPPED);
+            callback.onBookmarkAdded(bookmarkId, AddBookmarkCallback.SKIPPED);
             return;
         }
 
-        saveOfflinePage(enhancedId, webContents, callback);
+        saveOfflinePage(bookmarkId, webContents, callback);
     }
 
     /**
     * Save an offline copy for the bookmarked page asynchronously.
     *
     * @param bookmarkId The ID of the page to save an offline copy.
     * @param webContents A {@link WebContents} object.
     * @param callback The callback to be invoked when the offline copy is saved.
     */
     public void saveOfflinePage(final BookmarkId bookmarkId, WebContents webContents,
@@ skipping 76 matching lines @@
         return bookmarkIds;
     }
 
     /**
      * @return Offline page bridge.
      */
     public OfflinePageBridge getOfflinePageBridge() {
         return mOfflinePageBridge;
     }
 }