| Index: ui/shell_dialogs/select_file_dialog_auraandroid.h
|
| diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_auraandroid.h
|
| similarity index 62%
|
| copy from ui/shell_dialogs/select_file_dialog_android.h
|
| copy to ui/shell_dialogs/select_file_dialog_auraandroid.h
|
| index 9aee3fd39311e1b7854a8a89cc3005dba404838c..5b7a1630974a7f6f19e7eabf46227a7ca5844820 100644
|
| --- a/ui/shell_dialogs/select_file_dialog_android.h
|
| +++ b/ui/shell_dialogs/select_file_dialog_auraandroid.h
|
| @@ -1,14 +1,11 @@
|
| -// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| #ifndef UI_SHELL_DIALOGS_ANDROID_SELECT_FILE_DIALOG_ANDROID_H_
|
| #define UI_SHELL_DIALOGS_ANDROID_SELECT_FILE_DIALOG_ANDROID_H_
|
|
|
| -#include <jni.h>
|
| -
|
| -#include "base/android/scoped_java_ref.h"
|
| -#include "base/files/file_path.h"
|
| +#include "base/macros.h"
|
| #include "ui/shell_dialogs/select_file_dialog.h"
|
|
|
| namespace ui {
|
| @@ -18,25 +15,9 @@ class SelectFileDialogImpl : public SelectFileDialog {
|
| static SelectFileDialogImpl* Create(Listener* listener,
|
| SelectFilePolicy* policy);
|
|
|
| - void OnFileSelected(JNIEnv* env,
|
| - jobject java_object,
|
| - jstring filepath,
|
| - jstring display_name);
|
| -
|
| - void OnMultipleFilesSelected(JNIEnv* env,
|
| - jobject java_object,
|
| - jobjectArray filepaths,
|
| - jobjectArray display_names);
|
| -
|
| - void OnFileNotSelected(JNIEnv* env, jobject java_object);
|
| -
|
| // From SelectFileDialog
|
| 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.
|
| void SelectFileImpl(SelectFileDialog::Type type,
|
| const base::string16& title,
|
| const base::FilePath& default_path,
|
| @@ -46,8 +27,6 @@ class SelectFileDialogImpl : public SelectFileDialog {
|
| gfx::NativeWindow owning_window,
|
| void* params) override;
|
|
|
| - static bool RegisterSelectFileDialog(JNIEnv* env);
|
| -
|
| protected:
|
| ~SelectFileDialogImpl() override;
|
|
|
| @@ -56,8 +35,6 @@ class SelectFileDialogImpl : public SelectFileDialog {
|
|
|
| bool HasMultipleFileTypeChoicesImpl() override;
|
|
|
| - base::android::ScopedJavaGlobalRef<jobject> java_object_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(SelectFileDialogImpl);
|
| };
|
|
|
|
|