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

Unified Diff: content/public/common/file_chooser_params.h

Issue 14758008: Update the HTML Media Capture implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address the concerns benm raised on the bug Created 7 years, 7 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 | « chrome/browser/file_select_helper.cc ('k') | ui/DEPS » ('j') | ui/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/file_select_helper.cc ('k') | ui/DEPS » ('j') | ui/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698