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

Unified Diff: ui/shell_dialogs/select_file_dialog_win.cc

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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 | « ui/base/win/open_file_name_win_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/shell_dialogs/select_file_dialog_win.cc
diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc
index 6e1a8abf9ac9f831e2f83f3bc62e1fa825a42c42..b963b06f3a99eba7e9691644d574540ca08bc5cd 100644
--- a/ui/shell_dialogs/select_file_dialog_win.cc
+++ b/ui/shell_dialogs/select_file_dialog_win.cc
@@ -516,12 +516,12 @@ bool SelectFileDialogImpl::SaveFileAsWithFilter(
// Figure out what filter got selected. The filter index is 1-based.
std::wstring filter_selected;
if (*index > 0) {
- std::vector<Tuple2<base::string16, base::string16> > filters =
+ std::vector<Tuple<base::string16, base::string16>> filters =
ui::win::OpenFileName::GetFilters(save_as.GetOPENFILENAME());
if (*index > filters.size())
NOTREACHED() << "Invalid filter index.";
else
- filter_selected = filters[*index - 1].b;
+ filter_selected = get<1>(filters[*index - 1]);
}
// Get the extension that was suggested to the user (when the Save As dialog
« no previous file with comments | « ui/base/win/open_file_name_win_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698