Index: ui/shell_dialogs/select_file_dialog.h |
diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h |
index 60b24621f6cd9f416eca58c4e2babf042f432dc7..b52642b03b680e748d685378632bcbe361f92848 100644 |
--- a/ui/shell_dialogs/select_file_dialog.h |
+++ b/ui/shell_dialogs/select_file_dialog.h |
@@ -106,7 +106,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog |
// |
// Only pass more than one extension in the inner vector if the extensions |
// are equivalent. Do NOT include leading periods. |
- std::vector<std::vector<FilePath::StringType> > extensions; |
+ std::vector<std::vector<base::FilePath::StringType> > extensions; |
Mattias Nissler (ping if slow)
2013/02/06 17:53:33
unrelated changes?
Jói
2013/02/07 14:52:32
Yes, as in pref_member.h. Removed.
|
// Overrides the system descriptions of the specified extensions. Entries |
// correspond to |extensions|; if left blank the system descriptions will |
@@ -153,7 +153,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog |
const FilePath& default_path, |
const FileTypeInfo* file_types, |
int file_type_index, |
- const FilePath::StringType& default_extension, |
+ const base::FilePath::StringType& default_extension, |
gfx::NativeWindow owning_window, |
void* params); |
bool HasMultipleFileTypeChoices(); |
@@ -171,14 +171,15 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog |
// This is overridden in the platform-specific descendants of FileSelectDialog |
// and gets called from SelectFile after testing the |
// AllowFileSelectionDialogs-Policy. |
- virtual void SelectFileImpl(Type type, |
- const string16& title, |
- const FilePath& default_path, |
- const FileTypeInfo* file_types, |
- int file_type_index, |
- const FilePath::StringType& default_extension, |
- gfx::NativeWindow owning_window, |
- void* params) = 0; |
+ virtual void SelectFileImpl( |
+ Type type, |
+ const string16& title, |
+ const FilePath& default_path, |
+ const FileTypeInfo* file_types, |
+ int file_type_index, |
+ const base::FilePath::StringType& default_extension, |
+ gfx::NativeWindow owning_window, |
+ void* params) = 0; |
// Returns the global ShellDialogsDelegate instance if any. |
ShellDialogsDelegate* GetShellDialogsDelegate(); |