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

Unified Diff: ui/shell_dialogs/select_file_dialog.cc

Issue 12315139: Sort out build dependencies for LinuxUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add comment Created 7 years, 10 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/ui.gyp » ('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
diff --git a/ui/shell_dialogs/select_file_dialog.cc b/ui/shell_dialogs/select_file_dialog.cc
index 7b7c9e90b175b92e460b499de31b5ec9219bdbf4..427af7d2407d4ccc7b9dd8e158d4f22f89e7f78b 100644
--- a/ui/shell_dialogs/select_file_dialog.cc
+++ b/ui/shell_dialogs/select_file_dialog.cc
@@ -23,7 +23,7 @@
#elif defined(OS_ANDROID)
#include "ui/shell_dialogs/select_file_dialog_android.h"
#elif defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
-#include "ui/shell_dialogs/linux_ui_shell_dialog.h"
+#include "ui/shell_dialogs/linux_shell_dialog.h"
#endif
namespace {
@@ -79,10 +79,9 @@ scoped_refptr<SelectFileDialog> SelectFileDialog::Create(
}
#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
- const ui::LinuxUIShellDialog* linux_ui =
- static_cast<const ui::LinuxUIShellDialog*>(ui::LinuxUI::instance());
- if (linux_ui)
- return linux_ui->CreateSelectFileDialog(listener, policy);
+ const ui::LinuxShellDialog* shell_dialogs = ui::LinuxShellDialog::instance();
+ if (shell_dialogs)
+ return shell_dialogs->CreateSelectFileDialog(listener, policy);
#endif
#if defined(OS_WIN)
« no previous file with comments | « ui/shell_dialogs/select_file_dialog.h ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698