Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/ui/shell_dialogs/select_file_dialog.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/shell_dialogs/select_file_dialog_factory.h"
 #include "ui/shell_dialogs/select_file_policy.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 #include "ui/shell_dialogs/shell_dialogs_delegate.h"
 
 #if defined(OS_WIN)
 #include "ui/shell_dialogs/select_file_dialog_win.h"
 #elif defined(OS_MACOSX)
 #include "ui/shell_dialogs/select_file_dialog_mac.h"
 #elif defined(OS_ANDROID)
 #include "ui/shell_dialogs/select_file_dialog_android.h"
-#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
 #include "ui/shell_dialogs/linux_shell_dialog.h"
 #endif
 
 namespace {
 
 // Optional dialog factory. Leaked.
 ui::SelectFileDialogFactory* dialog_factory_ = NULL;
 
 // The global shell dialogs delegate.
 ui::ShellDialogsDelegate* g_shell_dialogs_delegate_ = NULL;
@@ skipping 35 matching lines @@
 // static
 scoped_refptr<SelectFileDialog> SelectFileDialog::Create(
     Listener* listener,
     ui::SelectFilePolicy* policy) {
   if (dialog_factory_) {
     SelectFileDialog* dialog = dialog_factory_->Create(listener, policy);
     if (dialog)
       return dialog;
   }
 
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
   const ui::LinuxShellDialog* shell_dialogs = ui::LinuxShellDialog::instance();
   if (shell_dialogs)
     return shell_dialogs->CreateSelectFileDialog(listener, policy);
 #endif
 
 #if defined(OS_WIN)
   // TODO(ananta)
   // Fix this for Chrome ASH on Windows.
   return CreateWinSelectFileDialog(listener, policy);
 #elif defined(OS_MACOSX) && !defined(USE_AURA)
@@ skipping 56 matching lines @@
 void SelectFileDialog::CancelFileSelection(void* params) {
   if (listener_)
     listener_->FileSelectionCanceled(params);
 }
 
 ShellDialogsDelegate* SelectFileDialog::GetShellDialogsDelegate() {
   return g_shell_dialogs_delegate_;
 }
 
 }  // namespace ui