Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/java/res/values-v17/styles.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014 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. -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Q: Why put style resources under values-v17/ ?
          A: Problem:
             1. paddingStart causes a crash on Galaxy Tab&Note b/8351339.
             2. So we wrote a build script(generate_v14_compatible_resources.py) to convert
@@ skipping 314 matching lines @@
         <item name="android:statusBarColor" tools:targetApi="21">@android:color/black</item>
         <item name="android:textColorLink">@color/light_active_color</item>
         <item name="colorPrimary">@color/light_active_color</item>
         <item name="colorAccent">@color/light_active_color</item>
 
         <!-- Remove ActionBar -->
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
     </style>
 
-    <!-- Enhanced bookmarks -->
-    <style name="EnhancedBookmarkDialog" parent="Theme.AppCompat.Light.DialogWhenLarge">
+    <!-- Bookmarks -->
+    <style name="BookmarkDialog" parent="Theme.AppCompat.Light.DialogWhenLarge">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="colorAccent">@color/light_active_color</item>
 
         <!-- Remove ActionBar -->
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
     </style>
-    <style name="EnhancedBookmarkDialogWhite" parent="EnhancedBookmarkDialog">
+    <style name="BookmarkDialogWhite" parent="BookmarkDialog">
       <item name="android:windowBackground">@drawable/bg_white_dialog</item>
     </style>
-    <style name="EnhancedBookmarkTitleBarButton">
+    <style name="BookmarkTitleBarButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@null</item>
         <item name="android:padding">15dp</item>
     </style>
-    <style name="EnhancedBookmarkMenuStyle" parent="Widget.AppCompat.ListPopupWindow">
+    <style name="BookmarkMenuStyle" parent="Widget.AppCompat.ListPopupWindow">
         <item name="android:popupBackground">@drawable/menu_bg</item>
     </style>
-    <style name="EnhancedBookmarkDrawerItemStyle">
+    <style name="BookmarkDrawerItemStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">?android:attr/listPreferredItemHeightSmall</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:gravity">start|center_vertical</item>
-        <item name="android:paddingStart">@dimen/enhanced_bookmark_drawer_drawable_padding</item>
-        <item name="android:paddingEnd">@dimen/enhanced_bookmark_drawer_drawable_padding</item>
+        <item name="android:paddingStart">@dimen/bookmark_drawer_drawable_padding</item>
+        <item name="android:paddingEnd">@dimen/bookmark_drawer_drawable_padding</item>
         <item name="android:singleLine">true</item>
         <item name="android:textAppearance">?android:attr/textAppearanceLargePopupMenu</item>
         <item name="android:textSize">14sp</item>
     </style>
 
     <!-- Signin promo dialog-->
     <style name="SigninPromoDialog" parent="Theme.AppCompat.Light">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
@@ skipping 80 matching lines @@
     <style name="ToolbarMenuButtonTablet" parent="ToolbarButton">
         <item name="android:layout_width">43dp</item>
         <item name="android:paddingEnd">3.5dp</item>
     </style>
     <style name="AppMenuItem">
         <item name="android:paddingStart">16dp</item>
         <item name="android:paddingEnd">16dp</item>
         <item name="android:background">?attr/listChoiceBackgroundIndicator</item>
     </style>
 </resources>