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 167609debcbe3799bd38f31e29b4c107dfe0ba70..5e5b5b4c5eedd8d86fb7ee8d84ceed232a8c3869 100644 |
--- a/ui/base/win/open_file_name_win.cc |
+++ b/ui/base/win/open_file_name_win.cc |
@@ -85,15 +85,15 @@ OpenFileName::~OpenFileName() { |
} |
void OpenFileName::SetFilters( |
- const std::vector<Tuple<base::string16, base::string16>>& filters) { |
+ const std::vector<base::Tuple<base::string16, base::string16>>& filters) { |
openfilename_.lpstrFilter = NULL; |
filter_buffer_.clear(); |
if (filters.empty()) |
return; |
for (const auto& filter : filters) { |
- filter_buffer_.append(get<0>(filter)); |
+ filter_buffer_.append(base::get<0>(filter)); |
filter_buffer_.push_back(0); |
- filter_buffer_.append(get<1>(filter)); |
+ filter_buffer_.append(base::get<1>(filter)); |
filter_buffer_.push_back(0); |
} |
filter_buffer_.push_back(0); |
@@ -202,9 +202,9 @@ void OpenFileName::SetResult(const base::FilePath& directory, |
} |
// static |
-std::vector<Tuple<base::string16, base::string16>> |
+std::vector<base::Tuple<base::string16, base::string16>> |
OpenFileName::GetFilters(const OPENFILENAME* openfilename) { |
- std::vector<Tuple<base::string16, base::string16>> filters; |
+ std::vector<base::Tuple<base::string16, base::string16>> filters; |
const base::char16* display_string = openfilename->lpstrFilter; |
if (!display_string) |
@@ -219,7 +219,7 @@ OpenFileName::GetFilters(const OPENFILENAME* openfilename) { |
while (*pattern_end) |
++pattern_end; |
filters.push_back( |
- MakeTuple(base::string16(display_string, display_string_end), |
+ base::MakeTuple(base::string16(display_string, display_string_end), |
base::string16(pattern, pattern_end))); |
display_string = pattern_end + 1; |
} |