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

Unified Diff: chrome/browser/ui/browser.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/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 478acf76fe8a8eea71e4551f5d135f1655591199..dc4fbd07682d10186770c1cee0da8d9144cfa7ae 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -106,6 +106,7 @@
#include "chrome/browser/ui/browser_ui_prefs.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/ui/chrome_select_file_policy.h"
#include "chrome/browser/ui/constrained_window_tab_helper.h"
#include "chrome/browser/ui/extensions/shell_window.h"
#include "chrome/browser/ui/find_bar/find_bar.h"
@@ -1010,8 +1011,8 @@ void Browser::OverrideEncoding(int encoding_id) {
void Browser::OpenFile() {
content::RecordAction(UserMetricsAction("OpenFile"));
- if (!select_file_dialog_.get())
- select_file_dialog_ = SelectFileDialog::Create(this);
+ select_file_dialog_ = SelectFileDialog::Create(
+ this, new ChromeSelectFilePolicy(GetActiveWebContents()));
const FilePath directory = profile_->last_selected_directory();
@@ -1020,7 +1021,6 @@ void Browser::OpenFile() {
select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
string16(), directory,
NULL, 0, FILE_PATH_LITERAL(""),
- GetActiveWebContents(),
parent_window, NULL);
}

Powered by Google App Engine
This is Rietveld 408576698