| Index: chrome/browser/file_select_helper.h
|
| diff --git a/chrome/browser/file_select_helper.h b/chrome/browser/file_select_helper.h
|
| index aa798ae51aa275dfec526da4fefd05d49fb2053d..72674a561c7b3f4775eb8ef7b35508a2e0a26c6c 100644
|
| --- a/chrome/browser/file_select_helper.h
|
| +++ b/chrome/browser/file_select_helper.h
|
| @@ -10,10 +10,10 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| -#include "chrome/browser/ui/select_file_dialog.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "net/base/directory_lister.h"
|
| +#include "ui/base/dialogs/select_file_dialog.h"
|
|
|
| class Profile;
|
|
|
| @@ -32,7 +32,7 @@ struct SelectedFileInfo;
|
| // and listener functions for file-selection dialogs.
|
| class FileSelectHelper
|
| : public base::RefCountedThreadSafe<FileSelectHelper>,
|
| - public SelectFileDialog::Listener,
|
| + public ui::SelectFileDialog::Listener,
|
| public content::NotificationObserver {
|
| public:
|
|
|
| @@ -130,7 +130,7 @@ class FileSelectHelper
|
| // http://whatwg.org/html/number-state.html#attr-input-accept
|
| // |accept_types| contains only valid lowercased MIME types or file extensions
|
| // beginning with a period (.).
|
| - SelectFileDialog::FileTypeInfo* GetFileTypesFromAcceptType(
|
| + ui::SelectFileDialog::FileTypeInfo* GetFileTypesFromAcceptType(
|
| const std::vector<string16>& accept_types);
|
|
|
| // Check the accept type is valid. It is expected to be all lower case with
|
| @@ -146,11 +146,11 @@ class FileSelectHelper
|
| content::WebContents* web_contents_;
|
|
|
| // Dialog box used for choosing files to upload from file form fields.
|
| - scoped_refptr<SelectFileDialog> select_file_dialog_;
|
| - scoped_ptr<SelectFileDialog::FileTypeInfo> select_file_types_;
|
| + scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
|
| + scoped_ptr<ui::SelectFileDialog::FileTypeInfo> select_file_types_;
|
|
|
| // The type of file dialog last shown.
|
| - SelectFileDialog::Type dialog_type_;
|
| + ui::SelectFileDialog::Type dialog_type_;
|
|
|
| // Maintain a list of active directory enumerations. These could come from
|
| // the file select dialog or from drag-and-drop of directories, so there could
|
|
|