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

Unified Diff: chrome/browser/extensions/api/file_system/file_system_api.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: fix chromeos 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/extensions/api/file_system/file_system_api.cc
diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc
index d70eea3cd5feda788bd7bec34a7e616e99e31873..d3ef0f2b90463ea5967f7be2034079557dc18926 100644
--- a/chrome/browser/extensions/api/file_system/file_system_api.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_api.cc
@@ -9,6 +9,7 @@
#include "base/file_util.h"
#include "chrome/browser/extensions/shell_window_registry.h"
#include "chrome/browser/platform_util.h"
+#include "chrome/browser/ui/chrome_select_file_policy.h"
#include "chrome/browser/ui/extensions/shell_window.h"
#include "chrome/browser/ui/select_file_dialog.h"
#include "chrome/common/extensions/api/file_system.h"
@@ -117,7 +118,8 @@ class FileSystemPickerFunction::FilePicker : public SelectFileDialog::Listener {
: suggested_path_(suggested_path),
for_save_(for_save),
function_(function) {
- select_file_dialog_ = SelectFileDialog::Create(this);
+ select_file_dialog_ = SelectFileDialog::Create(
+ this, new ChromeSelectFilePolicy(web_contents));
SelectFileDialog::FileTypeInfo file_type_info;
FilePath::StringType extension = suggested_path.Extension();
if (!extension.empty()) {
@@ -144,13 +146,14 @@ class FileSystemPickerFunction::FilePicker : public SelectFileDialog::Listener {
return;
}
- select_file_dialog_->SelectFile(for_save ?
- SelectFileDialog::SELECT_SAVEAS_FILE :
- SelectFileDialog::SELECT_OPEN_FILE,
- string16(),
- suggested_path,
- &file_type_info, 0, FILE_PATH_LITERAL(""),
- web_contents, owning_window, NULL);
+ select_file_dialog_->SelectFile(
+ for_save ?
+ SelectFileDialog::SELECT_SAVEAS_FILE :
+ SelectFileDialog::SELECT_OPEN_FILE,
+ string16(),
+ suggested_path,
+ &file_type_info, 0, FILE_PATH_LITERAL(""),
+ owning_window, NULL);
}
virtual ~FilePicker() {}

Powered by Google App Engine
This is Rietveld 408576698