| 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(
|
|
|