diff options
Diffstat (limited to 'win8/metro_driver/file_picker_ash.cc')
| -rw-r--r-- | win8/metro_driver/file_picker_ash.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/win8/metro_driver/file_picker_ash.cc b/win8/metro_driver/file_picker_ash.cc index e45301c..a420b53 100644 --- a/win8/metro_driver/file_picker_ash.cc +++ b/win8/metro_driver/file_picker_ash.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" +#include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/synchronization/waitable_event.h" #include "base/win/metro.h" @@ -239,9 +240,8 @@ HRESULT OpenFilePickerSession::StartFilePicker() { break; // There can be a single extension, or a list of semicolon-separated ones. - std::vector<base::string16> extensions_win32_style; - size_t extension_count = Tokenize(walk, L";", &extensions_win32_style); - DCHECK_EQ(extension_count, extensions_win32_style.size()); + std::vector<base::string16> extensions_win32_style = base::SplitString( + walk, L";", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); // Metro wants suffixes only, not patterns. mswrw::HString extension; @@ -421,9 +421,8 @@ HRESULT SaveFilePickerSession::StartFilePicker() { break; // There can be a single extension, or a list of semicolon-separated ones. - std::vector<base::string16> extensions_win32_style; - size_t extension_count = Tokenize(walk, L";", &extensions_win32_style); - DCHECK_EQ(extension_count, extensions_win32_style.size()); + std::vector<base::string16> extensions_win32_style = base::SplitString( + walk, L";", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); // Metro wants suffixes only, not patterns. Also, metro does not support // the all files ("*") pattern in the save picker. |