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

Unified Diff: ui/shell_dialogs/select_file_dialog.cc

Issue 11878031: Bring back the file dialogs for chrome AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months 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/shell_dialogs/select_file_dialog.h ('k') | ui/shell_dialogs/select_file_dialog_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/shell_dialogs/select_file_dialog.cc
===================================================================
--- ui/shell_dialogs/select_file_dialog.cc (revision 177251)
+++ ui/shell_dialogs/select_file_dialog.cc (working copy)
@@ -2,26 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/dialogs/select_file_dialog.h"
+#include "ui/shell_dialogs/select_file_dialog.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "build/build_config.h"
-#include "ui/base/dialogs/selected_file_info.h"
-#include "ui/base/dialogs/select_file_dialog_factory.h"
-#include "ui/base/dialogs/select_file_policy.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/linux_ui.h"
+#include "ui/shell_dialogs/linux_ui_shell_dialog.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"
#if defined(OS_WIN)
-#include "ui/base/dialogs/select_file_dialog_win.h"
+#include "ui/shell_dialogs/select_file_dialog_win.h"
#elif defined(OS_MACOSX)
-#include "ui/base/dialogs/select_file_dialog_mac.h"
+#include "ui/shell_dialogs/select_file_dialog_mac.h"
#elif defined(TOOLKIT_GTK)
-#include "ui/base/dialogs/gtk/select_file_dialog_impl.h"
+#include "ui/shell_dialogs/gtk/select_file_dialog_impl.h"
#elif defined(OS_ANDROID)
-#include "ui/base/dialogs/select_file_dialog_android.h"
+#include "ui/shell_dialogs/select_file_dialog_android.h"
#endif
namespace {
@@ -73,13 +73,15 @@
}
#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
- const ui::LinuxUI* linux_ui = ui::LinuxUI::instance();
+ const ui::LinuxUIShellDialog* linux_ui =
+ static_cast<ui::LinuxUIShellDialog*>(ui::LinuxUI::instance());
if (linux_ui)
return linux_ui->CreateSelectFileDialog(listener, policy);
#endif
-#if defined(OS_WIN) && !defined(USE_AURA)
- // TODO(port): The windows people need this to work in aura, too.
+#if defined(OS_WIN)
+ // TODO(ananta)
+ // Fix this for Chrome ASH on Windows.
return CreateWinSelectFileDialog(listener, policy);
#elif defined(OS_MACOSX) && !defined(USE_AURA)
return CreateMacSelectFileDialog(listener, policy);
« no previous file with comments | « ui/shell_dialogs/select_file_dialog.h ('k') | ui/shell_dialogs/select_file_dialog_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698