Upstreaming SelectFileDialog for Android

ui/base/dialogs/android/select_file_dialog_android.cc

Index: ui/base/dialogs/android/select_file_dialog_android.cc
diff --git a/ui/base/dialogs/android/select_file_dialog_android.cc b/ui/base/dialogs/android/select_file_dialog_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..95a551f1ad7fe9391b4e3216fcfff16cbe6605c2
--- /dev/null
+++ b/ui/base/dialogs/android/select_file_dialog_android.cc
@@ -0,0 +1,109 @@
+// Copyright (c) 2012 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.
+
+#include "select_file_dialog_android.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "base/android/jni_array.h"
+#include "base/android/scoped_java_ref.h"
+#include "base/logging.h"
+#include "base/string_split.h"
+#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
+#include "jni/SelectFileDialog_jni.h"
+#include "ui/gfx/android/window_android.h"
+
+namespace ui {

[Elliot Glaysher, 2012/09/11 16:51:47]

blank line under namespace

[aurimas_google.com, 2012/09/12 02:49:18]

Done.

+SelectFileDialog* CreateAndroidSelectFileDialog(
+    SelectFileDialog::Listener* listener,
+    SelectFilePolicy* policy) {
+  return SelectFileDialogImpl::Create(listener, policy);
+}
+
+// static
+SelectFileDialogImpl* SelectFileDialogImpl::Create(Listener* listener,
+                                           ui::SelectFilePolicy* policy) {
+  return new SelectFileDialogImpl(listener, policy);
+}
+
+SelectFileDialogImpl::SelectFileDialogImpl(Listener* listener,
+                                           ui::SelectFilePolicy* policy)
+    : ui::SelectFileDialog(listener, policy),
+      is_running_(false) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  java_object_.Reset(
+      Java_SelectFileDialog_create(env, reinterpret_cast<jint>(this)));
+}
+
+SelectFileDialogImpl::~SelectFileDialogImpl() {
+}
+
+void SelectFileDialogImpl::OnFileSelected(JNIEnv* env,
+                                          jobject,
+                                          jstring filepath) {
+  if (listener_) {
+    std::string path = base::android::ConvertJavaStringToUTF8(env, filepath);
+    listener_->FileSelected(FilePath(path), 0, NULL);
+  }
+
+  is_running_ = false;
+}
+
+void SelectFileDialogImpl::OnFileNotSelected(JNIEnv*, jobject) {
+  if (listener_)
+    listener_->FileSelectionCanceled(NULL);
+
+  is_running_ = false;
+}
+
+bool SelectFileDialogImpl::IsRunning(gfx::NativeWindow) const {
+  return is_running_;
+}
+
+void SelectFileDialogImpl::ListenerDestroyed() {
+  listener_ = 0;
+}
+
+void SelectFileDialogImpl::SelectFileImpl(
+    ui::SelectFileDialog::Type type,
+    const string16& title,
+    const FilePath& default_path,
+    const SelectFileDialog::FileTypeInfo* file_types,
+    int file_type_index,
+    const std::string& default_extension,
+    gfx::NativeWindow owning_window,
+    void* params) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+
+  std::vector<string16> accept_types =
+      *(reinterpret_cast<std::vector<string16>*>(params));
+
+  // The last string in params is expected to be the string with capture value.
+  ScopedJavaLocalRef<jstring> capture_value =
+      base::android::ConvertUTF16ToJavaString(env,
+          StringToLowerASCII(accept_types.back()));
+  base::android::CheckException(env);
+  accept_types.pop_back();
+
+  // The rest params elements are expected to be accept_types.
+  ScopedJavaLocalRef<jobjectArray> accept_types_java =
+      base::android::ToJavaArrayOfStrings(env, accept_types);
+
+  Java_SelectFileDialog_selectFile(env, java_object_.obj(),
+                                   accept_types_java.obj(),
+                                   capture_value.obj(),
+                                   owning_window->GetJavaObject().obj());
+  is_running_ = true;
+}
+
+bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool RegisterSelectFileDialog(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}

[Elliot Glaysher, 2012/09/11 16:51:47]

blank line between } and }

[aurimas_google.com, 2012/09/12 02:49:18]

Done.

+}  // namespace ui