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

Unified Diff: chrome/browser/file_select_helper.cc

Issue 14758008: Update the HTML Media Capture implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix attempt. Created 7 years, 5 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 | « no previous file | content/public/common/file_chooser_params.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/file_select_helper.cc
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc
index 6c44527a61e2c2519f888a5d77c6f8c3bbe30556..9ceb4384d916d5217865911c35347938545f0b4e 100644
--- a/chrome/browser/file_select_helper.cc
+++ b/chrome/browser/file_select_helper.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/file_select_helper.h"
#include <string>
+#include <utility>
#include "base/bind.h"
#include "base/file_util.h"
@@ -415,8 +416,8 @@ void FileSelectHelper::RunFileChooserOnUIThread(
#if defined(OS_ANDROID)
// Android needs the original MIME types and an additional capture value.
- std::vector<string16> accept_types(params.accept_types);
- accept_types.push_back(params.capture);
+ std::pair<std::vector<string16>, bool> accept_types =
+ std::make_pair(params.accept_types, params.capture);
#endif
select_file_dialog_->SelectFile(
« no previous file with comments | « no previous file | content/public/common/file_chooser_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698