Revert 216860 "Add option to import from bookmarks html file to ..."

trunk/src/chrome/browser/ui/webui/options/import_data_handler.h

Index: trunk/src/chrome/browser/ui/webui/options/import_data_handler.h
===================================================================
--- trunk/src/chrome/browser/ui/webui/options/import_data_handler.h	(revision 216877)
+++ trunk/src/chrome/browser/ui/webui/options/import_data_handler.h	(working copy)
@@ -12,7 +12,6 @@
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/common/importer/importer_data_types.h"
-#include "ui/shell_dialogs/select_file_dialog.h"
 
 class ExternalProcessImporterHost;
 class ImporterList;
@@ -22,8 +21,7 @@
 // Chrome personal stuff import data overlay UI handler.
 class ImportDataHandler : public OptionsPageUIHandler,
                           public importer::ImporterListObserver,
-                          public importer::ImporterProgressObserver,
-                          public ui::SelectFileDialog::Listener {
+                          public importer::ImporterProgressObserver {
  public:
   ImportDataHandler();
   virtual ~ImportDataHandler();
@@ -34,7 +32,7 @@
   virtual void InitializeHandler() OVERRIDE;
   virtual void InitializePage() OVERRIDE;
 
-  // content::WebUIMessageHandler:
+  // WebUIMessageHandler:
   virtual void RegisterMessages() OVERRIDE;
 
  private:
@@ -49,14 +47,6 @@
   virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE;
   virtual void ImportEnded() OVERRIDE;
 
-  // ui::SelectFileDialog::Listener:
-  virtual void FileSelected(const base::FilePath& path,
-                            int index,
-                            void* params) OVERRIDE;
-
-  // Opens a file selection dialog to choose the bookmarks HTML file.
-  void HandleChooseBookmarksFile(const base::ListValue* args);
-
   scoped_refptr<ImporterList> importer_list_;
 
   // If non-null it means importing is in progress. ImporterHost takes care
@@ -65,8 +55,6 @@
 
   bool import_did_succeed_;
 
-  scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
-
   DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);
 };
 
Property changes on: trunk/src/chrome/browser/ui/webui/options/import_data_handler.h
___________________________________________________________________
Deleted: svn:mergeinfo