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

Unified Diff: chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h

Issue 10829021: Use current gtk dialogs in linux_aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: derat nits Created 8 years, 5 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 | « chrome/browser/ui/libgtk2ui/libgtk2ui.gyp ('k') | chrome/browser/ui/libgtk2ui/select_file_dialog_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
index a225da628ec8f10033d98de7a73a58411a43bce4..571fa66b797f57f7ccb6fe9c25b018b9f889b38c 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
@@ -4,18 +4,26 @@
//
// This file implements common select dialog functionality between GTK and KDE.
-#ifndef CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
-#define CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
+#ifndef CHROME_BROWSER_UI_LIBGTK2UI_SELECT_FILE_DIALOG_IMPL_H_
+#define CHROME_BROWSER_UI_LIBGTK2UI_SELECT_FILE_DIALOG_IMPL_H_
#include <set>
#include "base/compiler_specific.h"
#include "base/nix/xdg_util.h"
-#include "chrome/browser/ui/select_file_dialog.h"
+#include "ui/base/dialogs/select_file_dialog.h"
+#include "ui/base/dialogs/select_file_policy.h"
+#include "ui/aura/window.h"
+
+namespace libgtk2ui {
// Shared implementation SelectFileDialog used by SelectFileDialogImplGTK
-class SelectFileDialogImpl : public SelectFileDialog {
+class SelectFileDialogImpl : public ui::SelectFileDialog {
public:
+ // Main factory method which returns correct type.
+ static ui::SelectFileDialog* Create(Listener* listener,
+ ui::SelectFilePolicy* policy);
+
// Factory method for creating a GTK-styled SelectFileDialogImpl
static SelectFileDialogImpl* NewSelectFileDialogImplGTK(
Listener* listener,
@@ -64,7 +72,7 @@ class SelectFileDialogImpl : public SelectFileDialog {
size_t file_type_index_;
// The set of all parent windows for which we are currently running dialogs.
- std::set<GtkWindow*> parents_;
+ std::set<aura::Window*> parents_;
// The type of dialog we are showing the user.
Type type_;
@@ -77,4 +85,6 @@ class SelectFileDialogImpl : public SelectFileDialog {
DISALLOW_COPY_AND_ASSIGN(SelectFileDialogImpl);
};
-#endif // CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
+} // namespace libgtk2ui
+
+#endif // CHROME_BROWSER_UI_LIBGTK2UI_SELECT_FILE_DIALOG_IMPL_H_
« no previous file with comments | « chrome/browser/ui/libgtk2ui/libgtk2ui.gyp ('k') | chrome/browser/ui/libgtk2ui/select_file_dialog_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698