Index: content/public/common/file_chooser_params.h |
diff --git a/content/public/common/file_chooser_params.h b/content/public/common/file_chooser_params.h |
index 7c31254363ca7c56dc74d03360b6c5f02708292c..6aeff9e3a0c5328dca6d92d9a7492c33cb4b5b42 100644 |
--- a/content/public/common/file_chooser_params.h |
+++ b/content/public/common/file_chooser_params.h |
@@ -10,6 +10,7 @@ |
#include "base/files/file_path.h" |
#include "base/string16.h" |
#include "content/common/content_export.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h" |
namespace content { |
@@ -47,11 +48,15 @@ struct CONTENT_EXPORT FileChooserParams { |
std::vector<string16> accept_types; |
#if defined(OS_ANDROID) |
- // Used to select items other than files, i.e. camera/mic. See |
- // SelectFileDialog.java for more details. |
+ // See http://www.w3.org/TR/html-media-capture for more information. |
+ // If true, the data should be obtained using the device's camera/mic/etc. |
joth
2013/05/15 20:03:59
nit: position this comment inside the #if below im
|
// TODO(jrg): upstream SelectFileDialog.java! Currently lives in chrome/. |
joth
2013/05/15 20:03:59
this TODO is obsolete and can go. (FTR - that file
|
+#if defined(NEW_MEDIA_CAPTURE_IMPLEMENTATION) |
joth
2013/05/15 20:03:59
rather than spluging usage of this marco all over
|
+ bool capture; |
+#else |
string16 capture; |
#endif |
+#endif |
}; |
} // namespace content |