Rename EnhancedBookmarks to Bookmarks, part 1.

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.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.app.Activity;
 import android.content.Context;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
 import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkModelObserver;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.widget.NumberRollView;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
 
 import java.util.List;
 
 /**
  * Main action bar of Enhanced Bookmark UI. It is responsible for displaying title and buttons
  * associated with the current context.
  */
-public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookmarkUIObserver,
+public class BookmarkActionBar extends Toolbar implements BookmarkUIObserver,
         OnMenuItemClickListener, OnClickListener {
     private static final int NAVIGATION_BUTTON_NONE = 0;
     private static final int NAVIGATION_BUTTON_MENU = 1;
     private static final int NAVIGATION_BUTTON_BACK = 2;
     private static final int NAVIGATION_BUTTON_SELECTION_BACK = 3;
 
     private int mNavigationButton;
     private BookmarkItem mCurrentFolder;
-    private EnhancedBookmarkDelegate mDelegate;
+    private BookmarkDelegate mDelegate;
     private ActionBarDrawerToggle mActionBarDrawerToggle;
     private boolean mIsSelectionEnabled;
 
     private BookmarkModelObserver mBookmarkModelObserver = new BookmarkModelObserver() {
         @Override
         public void bookmarkModelChanged() {
             onSelectionStateChange(mDelegate.getSelectedBookmarks());
         }
     };
 
-    public EnhancedBookmarkActionBar(Context context, AttributeSet attrs) {
+    public BookmarkActionBar(Context context, AttributeSet attrs) {
         super(context, attrs);
         setNavigationOnClickListener(this);
         inflateMenu(R.menu.eb_action_bar_menu);
         setOnMenuItemClickListener(this);
 
         getMenu()
                 .findItem(R.id.search_menu_id)
                 .setTitle(OfflinePageUtils.getStringId(
                         R.string.enhanced_bookmark_action_bar_search));
         getMenu()
@@ skipping 23 matching lines @@
                 mDelegate.clearSelection();
                 break;
             default:
                 assert false : "Incorrect navigation button state";
         }
     }
 
     @Override
     public boolean onMenuItemClick(MenuItem menuItem) {
         if (menuItem.getItemId() == R.id.edit_menu_id) {
-            EnhancedBookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
+            BookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                     mCurrentFolder.getId());
         } else if (menuItem.getItemId() == R.id.close_menu_id) {
-            EnhancedBookmarkUtils.finishActivityOnPhone(getContext());
+            BookmarkUtils.finishActivityOnPhone(getContext());
             return true;
         } else if (menuItem.getItemId() == R.id.search_menu_id) {
             mDelegate.openSearchUI();
             return true;
         } else if (menuItem.getItemId() == R.id.selection_mode_edit_menu_id) {
             List<BookmarkId> list = mDelegate.getSelectedBookmarks();
             assert list.size() == 1;
             BookmarkItem item = mDelegate.getModel().getBookmarkById(list.get(0));
             if (item.isFolder()) {
-                EnhancedBookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
+                BookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                         item.getId());

[Ian Wen, 2016/02/10 22:59:04]

Push #111 to #110?

[newt (away), 2016/02/11 03:10:07]

Done.

             } else {
-                EnhancedBookmarkUtils.startEditActivity(getContext(), item.getId(), null);
+                BookmarkUtils.startEditActivity(getContext(), item.getId(), null);
             }
             return true;
         } else if (menuItem.getItemId() == R.id.selection_mode_move_menu_id) {
             List<BookmarkId> list = mDelegate.getSelectedBookmarks();
             if (list.size() >= 1) {
-                EnhancedBookmarkFolderSelectActivity.startFolderSelectActivity(getContext(),
+                BookmarkFolderSelectActivity.startFolderSelectActivity(getContext(),
                         list.toArray(new BookmarkId[list.size()]));
             }
             return true;
         } else if (menuItem.getItemId() == R.id.selection_mode_delete_menu_id) {
             mDelegate.getModel().deleteBookmarks(
                     mDelegate.getSelectedBookmarks().toArray(new BookmarkId[0]));
             return true;
         }
 
         assert false : "Unhandled menu click.";
@@ skipping 64 matching lines @@
         mActionBarDrawerToggle.syncState();
     }
 
     void showLoadingUi() {
         setTitle(null);
         setNavigationButton(NAVIGATION_BUTTON_NONE);
         getMenu().findItem(R.id.search_menu_id).setVisible(false);
         getMenu().findItem(R.id.edit_menu_id).setVisible(false);
     }
 
-    // EnhancedBookmarkUIObserver implementations.
+    // BookmarkUIObserver implementations.
 
     @Override
-    public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {
+    public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         mDelegate = delegate;
         mDelegate.addUIObserver(this);
         if (!delegate.isDialogUi()) getMenu().removeItem(R.id.close_menu_id);
         delegate.getModel().addObserver(mBookmarkModelObserver);
     }
 
     @Override
     public void onDestroy() {
         mDelegate.removeUIObserver(this);
         mDelegate.getModel().removeObserver(mBookmarkModelObserver);
@@ skipping 23 matching lines @@
                 setTitle(mCurrentFolder.getTitle());
             }
             setNavigationButton(NAVIGATION_BUTTON_MENU);
         } else {
             setTitle(mCurrentFolder.getTitle());
             setNavigationButton(NAVIGATION_BUTTON_BACK);
         }
     }
 
     @Override
-    public void onFilterStateSet(EnhancedBookmarkFilter filter) {
-        assert filter == EnhancedBookmarkFilter.OFFLINE_PAGES;
+    public void onFilterStateSet(BookmarkFilter filter) {
+        assert filter == BookmarkFilter.OFFLINE_PAGES;
         setTitle(R.string.enhanced_bookmark_title_bar_filter_offline_pages);
         setNavigationButton(NAVIGATION_BUTTON_MENU);
         getMenu().findItem(R.id.edit_menu_id).setVisible(false);
     }
 
     @Override
     public void onSelectionStateChange(List<BookmarkId> selectedBookmarks) {
         boolean wasSelectionEnabled = mIsSelectionEnabled;
         mIsSelectionEnabled = mDelegate.isSelectionEnabled();
         NumberRollView numberRollView = (NumberRollView) findViewById(R.id.selection_mode_number);
@@ skipping 31 matching lines @@
             numberRollView.setNumber(0, false);
 
             mDelegate.notifyStateChange(this);
         }
     }
 
     private int getTitleForAllItems() {
         return OfflinePageUtils.getStringId(R.string.enhanced_bookmark_title_bar_all_items);
     }
 }