329343 - hook up bookmark import menu item. r=annie.sullivan@gmail.com

browser/components/places/content/commands.inc

@@ -3,8 +3,12 @@
             oncommandupdate="PlacesController.onCommandUpdate()">
   <command id="placesCmd_find" label="&cmd.find.label;" accesskey="&cmd.find.accesskey;"
            oncommand="PlacesSearchBox.focus();"/>
-  <command id="placesCmd_export" label="&cmd.export.label;" accesskey="&cmd.export.accesskey;"/>
-  <command id="placesCmd_import" label="&cmd.import.label;" accesskey="&cmd.import.accesskey;"/>
+  <command id="placesCmd_export" 
+           label="&cmd.export.label;" accesskey="&cmd.export.accesskey;"
+           disabled="true"/>
+  <command id="placesCmd_import" 
+           label="&cmd.import.label;" accesskey="&cmd.import.accesskey;"
+           oncommand="PlacesOrganizer.importBookmarks();"/>
   <command id="placesCmd_search:save"/>
   <command id="placesCmd_search:moreCriteria"
            oncommand="PlacesQueryBuilder.toggle();"/>

browser/components/places/content/places.js

@@ -182,6 +182,15 @@ var PlacesOrganizer = {
   getCurrentOptions: function PP_getCurrentOptions() {
     var result = this._content.getResult();
     return result.root.QueryInterface(Ci.nsINavHistoryQueryResultNode).queryOptions;
+  },
+  
+  /**
+   * Show the migration wizard for importing from a file.
+   */
+  importBookmarks: function PO_import() {
+    var features = "modal,centerscreen,chrome,resizable=no";
+    openDialog("chrome://browser/content/migration/migration.xul",
+               "", features, "bookmarks");
   }
 };