Re-engineer edit screen in enhanced bookmark

chrome/android/java/strings/android_chrome_strings.grd

Index: chrome/android/java/strings/android_chrome_strings.grd
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
index f007ebd712de15cd85521baec2dcd2d3d1ef64fc..218089dec738d671bbfd4fe04514c9b5790fe3e3 100644
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -1720,9 +1720,6 @@ Just open Chrome on your computer, go to the menu, and select “Sign in to Chro
       <message name="IDS_BOOKMARKS_FOLDER_EMPTY" desc="Text explaining that the currently selected bookmarks folder is empty.">
         No bookmarks here
       </message>
-      <message name="IDS_CONTEXTMENU_EDIT_BOOKMARK" desc="Context menu action to edit a bookmark. [CHAR-LIMIT=30]">
-        Edit bookmark
-      </message>
       <message name="IDS_CONTEXTMENU_DELETE_BOOKMARK" desc="Context menu action to delete a bookmark. [CHAR-LIMIT=30]">
         Delete bookmark
       </message>
@@ -1788,9 +1785,6 @@ Just open Chrome on your computer, go to the menu, and select “Sign in to Chro
       <message name="IDS_ENHANCED_BOOKMARK_ACTION_BAR_LIST_TOGGLE" desc="Button text for switching between list mode and grid mode [CHAR-LIMIT=32]">
         Toggle between list and grid mode
       </message>
-      <message name="IDS_ENHANCED_BOOKMARK_ACTION_BAR_EDIT_BOOKMARKS" desc="Button text for editing bookmarks action on the enhanced bookmark action bar [CHAR-LIMIT=32]">
-        Edit bookmarks
-      </message>
       <message name="IDS_ENHANCED_BOOKMARK_ACTION_BAR_MOVE" desc="Button text for bookmark move action on the enhanced bookmark action bar [CHAR-LIMIT=32]">
         Move bookmarks
       </message>
@@ -1800,21 +1794,12 @@ Just open Chrome on your computer, go to the menu, and select “Sign in to Chro
       <message name="IDS_ENHANCED_BOOKMARK_ACTION_BAR_CLOSE" desc="Button text for closing the current enhanced bookmark dialog on the enhanced bookmark action bar [CHAR-LIMIT=32]">
         Close dialog
       </message>
-      <message name="IDS_ENHANCED_BOOKMARK_DESCRIPTION_HINT" desc="Hint text to prompt users to input descriptions and notes for a bookmark. [CHAR-LIMIT=32]">
-        Enter a note
-      </message>
       <message name="IDS_ACCESSIBILITY_ENHANCED_BOOKMARK_DRAWER_TOGGLE_BTN_OPEN" desc="Content description for the button to show the navigation drawer.">
         Open navigation drawer
       </message>
       <message name="IDS_ACCESSIBILITY_ENHANCED_BOOKMARK_DRAWER_TOGGLE_BTN_CLOSE" desc="Content description for the button to close the navigation drawer.">
         Close navigation drawer
       </message>
-      <message name="IDS_ACCESSIBILITY_ENHANCED_BOOKMARK_DETAIL_VIEW" desc="Content description for the screen that allows the user to edit a bookmark.">
-        Edit bookmark
-      </message>
-      <message name="IDS_ENHANCED_BOOKMARK_DETAIL_TRANSITION_NAME" translateable="false" >
-        EnhancedBookmarkDetailActivity.CardTransition
-      </message>
 
       <!-- Find in page -->
       <message name="IDS_HINT_FIND_IN_PAGE" desc="Hint text to show for the find in page search field when the search field is empty.">
@@ -1845,7 +1830,7 @@ Just open Chrome on your computer, go to the menu, and select “Sign in to Chro
       <message name="IDS_ADD_BOOKMARK" desc='Title of the "Add Bookmark" form dialog. [CHAR-LIMIT=30]'>
         Add bookmark
       </message>
-      <message name="IDS_EDIT_BOOKMARK" desc='Title of the "Edit Bookmark" form dialog. [CHAR-LIMIT=30]'>
+      <message name="IDS_EDIT_BOOKMARK" desc='The string prompting the user to edit the content of a bookmark. [CHAR-LIMIT=30]'>
         Edit bookmark
       </message>
       <message name="IDS_ADD_FOLDER" desc='Title of the "Add Folderk" form dialog. [CHAR-LIMIT=30]'>