Index: ui/base/win/open_file_name_win.cc |
diff --git a/ui/base/win/open_file_name_win.cc b/ui/base/win/open_file_name_win.cc |
index 3914fa5cfae43951dc8ace26a60bf10565df7345..167609debcbe3799bd38f31e29b4c107dfe0ba70 100644 |
--- a/ui/base/win/open_file_name_win.cc |
+++ b/ui/base/win/open_file_name_win.cc |
@@ -85,18 +85,15 @@ OpenFileName::~OpenFileName() { |
} |
void OpenFileName::SetFilters( |
- const std::vector<Tuple2<base::string16, base::string16> >& filters) { |
+ const std::vector<Tuple<base::string16, base::string16>>& filters) { |
openfilename_.lpstrFilter = NULL; |
filter_buffer_.clear(); |
if (filters.empty()) |
return; |
- for (std::vector<Tuple2<base::string16, base::string16> >::const_iterator |
- it = filters.begin(); |
- it != filters.end(); |
- ++it) { |
- filter_buffer_.append(it->a); |
+ for (const auto& filter : filters) { |
+ filter_buffer_.append(get<0>(filter)); |
filter_buffer_.push_back(0); |
- filter_buffer_.append(it->b); |
+ filter_buffer_.append(get<1>(filter)); |
filter_buffer_.push_back(0); |
} |
filter_buffer_.push_back(0); |
@@ -205,9 +202,9 @@ void OpenFileName::SetResult(const base::FilePath& directory, |
} |
// static |
-std::vector<Tuple2<base::string16, base::string16> > OpenFileName::GetFilters( |
- const OPENFILENAME* openfilename) { |
- std::vector<Tuple2<base::string16, base::string16> > filters; |
+std::vector<Tuple<base::string16, base::string16>> |
+OpenFileName::GetFilters(const OPENFILENAME* openfilename) { |
+ std::vector<Tuple<base::string16, base::string16>> filters; |
const base::char16* display_string = openfilename->lpstrFilter; |
if (!display_string) |