diff options
Diffstat (limited to 'chromium/ui/shell_dialogs/select_file_dialog.cc')
| -rw-r--r-- | chromium/ui/shell_dialogs/select_file_dialog.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chromium/ui/shell_dialogs/select_file_dialog.cc b/chromium/ui/shell_dialogs/select_file_dialog.cc index 06dd13ef29a..e0449a7b0a3 100644 --- a/chromium/ui/shell_dialogs/select_file_dialog.cc +++ b/chromium/ui/shell_dialogs/select_file_dialog.cc @@ -18,11 +18,9 @@ #include "ui/shell_dialogs/select_file_dialog_win.h" #elif defined(OS_MACOSX) #include "ui/shell_dialogs/select_file_dialog_mac.h" -#elif defined(TOOLKIT_GTK) -#include "ui/shell_dialogs/gtk/select_file_dialog_impl.h" #elif defined(OS_ANDROID) #include "ui/shell_dialogs/select_file_dialog_android.h" -#elif defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX) +#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) #include "ui/shell_dialogs/linux_shell_dialog.h" #endif @@ -78,7 +76,7 @@ scoped_refptr<SelectFileDialog> SelectFileDialog::Create( return dialog; } -#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX) +#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) const ui::LinuxShellDialog* shell_dialogs = ui::LinuxShellDialog::instance(); if (shell_dialogs) return shell_dialogs->CreateSelectFileDialog(listener, policy); @@ -90,13 +88,12 @@ scoped_refptr<SelectFileDialog> SelectFileDialog::Create( return CreateWinSelectFileDialog(listener, policy); #elif defined(OS_MACOSX) && !defined(USE_AURA) return CreateMacSelectFileDialog(listener, policy); -#elif defined(TOOLKIT_GTK) - return CreateLinuxSelectFileDialog(listener, policy); #elif defined(OS_ANDROID) return CreateAndroidSelectFileDialog(listener, policy); -#endif - +#else + NOTIMPLEMENTED(); return NULL; +#endif } void SelectFileDialog::SelectFile( |