Reland "Add option to import from bookmarks html file to ...""

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 891ad93fdcfbb350df860b990c3f92a64108e288..66be03cd238a8713b29f617e8f6ad831220c7716 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7216,6 +7216,9 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
       <message name="IDS_IMPORT_FROM_SAFARI" desc="browser combo box: Safari">
         Safari
       </message>
+      <message name="IDS_IMPORT_FROM_BOOKMARKS_HTML_FILE" desc="browser combo box: Bookmarks HTML File">
+        Bookmarks HTML File
+      </message>
       <message name="IDS_IMPORT_ITEMS_LABEL" desc="Label before item select checkboxes">
         Select items to import:
       </message>
@@ -7241,6 +7244,9 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
       <message name="IDS_IMPORT_COMMIT" desc="Text for OK button on dialog">
         Import
       </message>
+      <message name="IDS_IMPORT_CHOOSE_FILE" desc="Text for the Choose File on dialog">
+        Choose File
+      </message>
 
       <message name="IDS_IMPORTER_GOOGLE_LOGIN_TEXT" desc="The message to be displayed on dialog">
         In order to import Toolbar bookmarks into Chrome, you must be signed in to your Google account.  Please sign in and try to import again.