Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: ui/base/dialogs/select_file_dialog.cc

Issue 10916160: Upstreaming SelectFileDialog for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/android/ui_jni_registrar.cc ('k') | ui/base/dialogs/select_file_dialog_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/dialogs/select_file_dialog.cc
diff --git a/ui/base/dialogs/select_file_dialog.cc b/ui/base/dialogs/select_file_dialog.cc
index 838c22007fea4e310257b98e8345ea240fc8ae05..ac88cc4052b253cd840258dbe7705caf68a50afe 100644
--- a/ui/base/dialogs/select_file_dialog.cc
+++ b/ui/base/dialogs/select_file_dialog.cc
@@ -20,6 +20,8 @@
#include "ui/base/dialogs/select_file_dialog_mac.h"
#elif defined(TOOLKIT_GTK)
#include "ui/base/dialogs/gtk/select_file_dialog_impl.h"
+#elif defined(OS_ANDROID)
+#include "ui/base/dialogs/select_file_dialog_android.h"
#endif
namespace {
@@ -84,8 +86,7 @@ SelectFileDialog* SelectFileDialog::Create(Listener* listener,
#elif defined(TOOLKIT_GTK)
return CreateLinuxSelectFileDialog(listener, policy);
#elif defined(OS_ANDROID)
- // see crbug.com/116131 to track implemenation of SelectFileDialog
- NOTIMPLEMENTED();
+ return CreateAndroidSelectFileDialog(listener, policy);
#endif
return NULL;
« no previous file with comments | « ui/android/ui_jni_registrar.cc ('k') | ui/base/dialogs/select_file_dialog_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698