| Index: chrome/browser/file_select_helper.h
|
| diff --git a/chrome/browser/file_select_helper.h b/chrome/browser/file_select_helper.h
|
| index ba8441b638c7343033a3c448903181b48a17640f..9288037e73c9c232d7702a9c52182e6d6f7dc75d 100644
|
| --- a/chrome/browser/file_select_helper.h
|
| +++ b/chrome/browser/file_select_helper.h
|
| @@ -20,7 +20,7 @@ struct ViewHostMsg_RunFileChooser_Params;
|
|
|
| class FileSelectHelper
|
| : public SelectFileDialog::Listener,
|
| - public net::DirectoryLister::DirectoryListerDelegate,
|
| + public net::DirectoryLister::Delegate,
|
| public RenderViewHostDelegate::FileSelect,
|
| public NotificationObserver {
|
| public:
|
| @@ -33,9 +33,8 @@ class FileSelectHelper
|
| void* params);
|
| virtual void FileSelectionCanceled(void* params);
|
|
|
| - // net::DirectoryLister::DirectoryListerDelegate
|
| - virtual void OnListFile(
|
| - const net::DirectoryLister::DirectoryListerData& data);
|
| + // net::DirectoryLister::Delegate
|
| + virtual void OnListFile(const net::DirectoryLister::Data& data);
|
| virtual void OnListDone(int error);
|
|
|
| // RenderViewHostDelegate::FileSelect
|
| @@ -70,7 +69,7 @@ class FileSelectHelper
|
| SelectFileDialog::Type dialog_type_;
|
|
|
| // The current directory lister (runs on a separate thread).
|
| - scoped_refptr<net::DirectoryLister> directory_lister_;
|
| + scoped_ptr<net::DirectoryLister> directory_lister_;
|
|
|
| // The current directory lister results, which may update incrementally
|
| // as the listing proceeds.
|
|
|