Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchView.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 android.preference.PreferenceManager;
 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
@@ skipping 48 matching lines @@
             super(context, attrs);
         }
 
         @Override
         protected void onFinishInflate() {
             super.onFinishInflate();
             mResultEmptySwitcher = (ViewSwitcher) findViewById(R.id.result_empty_switcher);
         }
 
         void showHistory() {
-            if (getCurrentView().getId() == R.id.eb_history_list) return;
+            if (getCurrentView().getId() == R.id.bookmark_history_list) return;
             showNext();
         }
 
         void showResult() {
-            if (getCurrentView().getId() == R.id.eb_history_list) showNext();
-            if (mResultEmptySwitcher.getCurrentView().getId() == R.id.eb_search_empty_view) {
+            if (getCurrentView().getId() == R.id.bookmark_history_list) showNext();
+            if (mResultEmptySwitcher.getCurrentView().getId() == R.id.bookmark_search_empty_view) {
                 mResultEmptySwitcher.showNext();
             }
         }
 
         void showEmpty() {
-            if (getCurrentView().getId() == R.id.eb_history_list) showNext();
-            if (mResultEmptySwitcher.getCurrentView().getId() == R.id.eb_result_list) {
+            if (getCurrentView().getId() == R.id.bookmark_history_list) showNext();
+            if (mResultEmptySwitcher.getCurrentView().getId() == R.id.bookmark_result_list) {
                 mResultEmptySwitcher.showNext();
             }
         }
     }
 
     private static enum UIState {HISTORY, RESULT, EMPTY}
 
     private static final String PREF_SEARCH_HISTORY = "bookmark_search_history";
     private static final int SEARCH_HISTORY_MAX_ENTRIES = 10;
     private static final int HISTORY_ITEM_PADDING_START_DP = 72;
@@ skipping 28 matching lines @@
     /**
      * Constructor for inflating from XML.
      */
     public BookmarkSearchView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        mSearchText = (EditText) findViewById(R.id.eb_search_text);
-        mResultList = (ListView) findViewById(R.id.eb_result_list);
-        mHistoryList = (ListView) findViewById(R.id.eb_history_list);
+        mSearchText = (EditText) findViewById(R.id.bookmark_search_text);
+        mResultList = (ListView) findViewById(R.id.bookmark_result_list);
+        mHistoryList = (ListView) findViewById(R.id.bookmark_history_list);
         mHistoryResultSwitcher = (HistoryResultSwitcher) findViewById(R.id.history_result_switcher);
 
         Toolbar searchBar = (Toolbar) findViewById(R.id.search_bar);
-        searchBar.setNavigationIcon(R.drawable.eb_back_normal);
+        searchBar.setNavigationIcon(R.drawable.bookmark_back_normal);
         searchBar.setNavigationContentDescription(R.string.accessibility_toolbar_btn_back);
         searchBar.setNavigationOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 onBackPressed();
             }
         });
 
         mHistoryList.setOnItemClickListener(this);
         mSearchText.setOnEditorActionListener(this);
@@ skipping 240 matching lines @@
         @Override
         public long getItemId(int position) {
             return position;
         }
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             final BookmarkMatch bookmarkMatch = getItem(position);
             if (convertView == null) {
                 convertView = LayoutInflater.from(parent.getContext()).inflate(
-                        R.layout.eb_search_row, parent, false);
+                        R.layout.bookmark_search_row, parent, false);
             }
             final BookmarkSearchRow row = (BookmarkSearchRow) convertView;
             row.onBookmarkDelegateInitialized(mDelegate);
             row.setBookmarkId(bookmarkMatch.getBookmarkId());
             row.setSearchHistoryDelegate(BookmarkSearchView.this);
             return convertView;
         }
     }
 }