| Index: ui/shell_dialogs/select_file_dialog_android.h
|
| diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h
|
| index 90abdbb4b5fe835e8d41fb9f0cc9e1f3e6830b98..9aee3fd39311e1b7854a8a89cc3005dba404838c 100644
|
| --- a/ui/shell_dialogs/select_file_dialog_android.h
|
| +++ b/ui/shell_dialogs/select_file_dialog_android.h
|
| @@ -31,31 +31,30 @@ class SelectFileDialogImpl : public SelectFileDialog {
|
| void OnFileNotSelected(JNIEnv* env, jobject java_object);
|
|
|
| // From SelectFileDialog
|
| - virtual bool IsRunning(gfx::NativeWindow) const override;
|
| - virtual void ListenerDestroyed() override;
|
| + bool IsRunning(gfx::NativeWindow) const override;
|
| + void ListenerDestroyed() override;
|
|
|
| // Called when it is time to display the file picker.
|
| // params is expected to be a vector<string16> with accept_types first and
|
| // the capture value as the last element of the vector.
|
| - virtual void SelectFileImpl(
|
| - SelectFileDialog::Type type,
|
| - const base::string16& title,
|
| - const base::FilePath& default_path,
|
| - const SelectFileDialog::FileTypeInfo* file_types,
|
| - int file_type_index,
|
| - const std::string& default_extension,
|
| - gfx::NativeWindow owning_window,
|
| - void* params) override;
|
| + void SelectFileImpl(SelectFileDialog::Type type,
|
| + const base::string16& title,
|
| + const base::FilePath& default_path,
|
| + const SelectFileDialog::FileTypeInfo* file_types,
|
| + int file_type_index,
|
| + const std::string& default_extension,
|
| + gfx::NativeWindow owning_window,
|
| + void* params) override;
|
|
|
| static bool RegisterSelectFileDialog(JNIEnv* env);
|
|
|
| protected:
|
| - virtual ~SelectFileDialogImpl();
|
| + ~SelectFileDialogImpl() override;
|
|
|
| private:
|
| SelectFileDialogImpl(Listener* listener, SelectFilePolicy* policy);
|
|
|
| - virtual bool HasMultipleFileTypeChoicesImpl() override;
|
| + bool HasMultipleFileTypeChoicesImpl() override;
|
|
|
| base::android::ScopedJavaGlobalRef<jobject> java_object_;
|
|
|
|
|