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

Unified Diff: chrome/browser/ui/views/select_file_dialog_extension.cc

Issue 10667026: Start consolidating cross-port file selection code into ui/base/dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Attempt to fix win Created 8 years, 6 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
Index: chrome/browser/ui/views/select_file_dialog_extension.cc
diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc
index 44054e320c791fdcfc3b7309f008d3a1e02c4b68..0ff17867de37d1908f3c1498b61f4b64a4ae0d89 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/chrome_select_file_policy.h"
#include "chrome/browser/ui/extensions/shell_window.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/views/extensions/extension_dialog.h"
@@ -84,21 +85,25 @@ scoped_refptr<SelectFileDialogExtension> PendingDialog::Find(int32 tab_id) {
// TODO(jamescook): Change all instances of SelectFileDialog::Create to return
// scoped_refptr<SelectFileDialog> as object is ref-counted.
// static
-SelectFileDialog* SelectFileDialog::Create(Listener* listener) {
+SelectFileDialog* SelectFileDialog::Create(Listener* listener,
+ ui::SelectFilePolicy* policy) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- return SelectFileDialogExtension::Create(listener);
+ return SelectFileDialogExtension::Create(listener, policy);
}
/////////////////////////////////////////////////////////////////////////////
// static
SelectFileDialogExtension* SelectFileDialogExtension::Create(
- Listener* listener) {
- return new SelectFileDialogExtension(listener);
+ Listener* listener,
+ ui::SelectFilePolicy* policy) {
+ return new SelectFileDialogExtension(listener, policy);
}
-SelectFileDialogExtension::SelectFileDialogExtension(Listener* listener)
- : SelectFileDialog(listener),
+SelectFileDialogExtension::SelectFileDialogExtension(
+ Listener* listener,
+ ui::SelectFilePolicy* policy)
+ : SelectFileDialog(listener, policy),
has_multiple_file_type_choices_(false),
tab_id_(0),
profile_(NULL),

Powered by Google App Engine
This is Rietveld 408576698