Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.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.offlinepages;
 
 import android.content.Context;
 import android.os.Environment;
 
 import org.chromium.base.Log;
@@ skipping 65 matching lines @@
      *        strings.
      * return The resource ID of UI string shown to the user, depending on the experiment.
      */
     public static int getStringId(int stringResId) {
         if (!OfflinePageBridge.isEnabled()) {
             return stringResId;
         }
         if (OfflinePageBridge.getFeatureMode() != FeatureMode.ENABLED_AS_SAVED_PAGES) {
             return stringResId;
         }
-        if (stringResId == R.string.enhanced_bookmark_action_bar_delete) {
+        if (stringResId == R.string.bookmark_action_bar_delete) {
             return R.string.offline_pages_action_bar_delete;
-        } else if (stringResId == R.string.enhanced_bookmark_action_bar_move) {
+        } else if (stringResId == R.string.bookmark_action_bar_move) {
             return R.string.offline_pages_action_bar_move;
-        } else if (stringResId == R.string.enhanced_bookmark_action_bar_search) {
+        } else if (stringResId == R.string.bookmark_action_bar_search) {
             return R.string.offline_pages_action_bar_search;
         } else if (stringResId == R.string.edit_bookmark) {
             return R.string.offline_pages_edit_item;
-        } else if (stringResId == R.string.enhanced_bookmark_drawer_all_items) {
+        } else if (stringResId == R.string.bookmark_drawer_all_items) {
             return R.string.offline_pages_all_items;
-        } else if (stringResId == R.string.enhanced_bookmark_title_bar_all_items) {
+        } else if (stringResId == R.string.bookmark_title_bar_all_items) {
             return R.string.offline_pages_all_items;
         } else if (stringResId == R.string.bookmarks) {
             return R.string.offline_pages_saved_pages;
         } else if (stringResId == R.string.menu_bookmarks) {
             return R.string.menu_bookmarks_offline_pages;
         } else if (stringResId == R.string.ntp_bookmarks) {
             return R.string.offline_pages_ntp_button_name;
         } else if (stringResId == R.string.accessibility_ntp_toolbar_btn_bookmarks) {
             return R.string.offline_pages_ntp_button_accessibility;
         } else if (stringResId == R.string.bookmarks_folder_empty) {
@@ skipping 155 matching lines @@
             final SnackbarController snackbarController) {
         Log.d(TAG, "showReloadSnackbar called with controller " + snackbarController);
         int buttonType = RELOAD_BUTTON;
         int actionTextId = R.string.reload;
         showOfflineSnackbar(activity, snackbarController, buttonType, actionTextId);
     }
 
     public static void showEditSnackbar(final ChromeActivity activity,
             final SnackbarController snackbarController) {
         int buttonType = EDIT_BUTTON;
-        int actionTextId = R.string.enhanced_bookmark_item_edit;
+        int actionTextId = R.string.bookmark_item_edit;
         showOfflineSnackbar(activity, snackbarController, buttonType, actionTextId);
     }
 
     /**
      * Shows the snackbar for the current tab to provide offline specific information.
      * @param activity The activity owning the tab.
      * @param snackbarController Class to show the snackbar.
      * @param buttonType Which snackbar button to show.
      * @param actionTextId Resource ID of the text to put on the snackbar button.
      */
@@ skipping 55 matching lines @@
                         RecordUserAction.record("OfflinePages.ViewingOffline.EditButtonNotClicked");
                         break;
                     default:
                         assert false;
                         break;
                 }
             }
         };
     }
 }