Pull in file chooser from Chromium

fix brave/browser-laptop#10666 fix brave/browser-laptop#8601 Auditors: @darkdh, @bbondy, @bsclifton, @bridiver
brave · Oct 25, 2017 · 4a4d3de · 4a4d3de
1 parent 0aa85d0
commit 4a4d3de
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 279 deletions.
diff --git a/atom/browser/BUILD.gn b/atom/browser/BUILD.gn
@@ -165,8 +165,6 @@ source_set("browser") {
     "web_contents_permission_helper.h",
     "web_contents_preferences.cc",
     "web_contents_preferences.h",
-    "web_dialog_helper.cc",
-    "web_dialog_helper.h",
     "window_list.cc",
     "window_list.h",
     "window_list_observer.h",

diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
@@ -14,14 +14,14 @@
 #include "atom/browser/native_window.h"
 #include "atom/browser/ui/file_dialog.h"
 #include "atom/browser/web_contents_permission_helper.h"
-#include "atom/browser/web_dialog_helper.h"
 #include "atom/common/atom_constants.h"
 #include "base/files/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "brave/browser/brave_javascript_dialog_manager.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
@@ -278,17 +278,13 @@ content::ColorChooser* CommonWebContentsDelegate::OpenColorChooser(
 void CommonWebContentsDelegate::RunFileChooser(
     content::RenderFrameHost* render_frame_host,
     const content::FileChooserParams& params) {
-  if (!web_dialog_helper_)
-    web_dialog_helper_.reset(new WebDialogHelper(owner_window()));
-  web_dialog_helper_->RunFileChooser(render_frame_host, params);
+    FileSelectHelper::RunFileChooser(render_frame_host, params);
 }
 
 void CommonWebContentsDelegate::EnumerateDirectory(content::WebContents* guest,
                                                    int request_id,
                                                    const base::FilePath& path) {
-  if (!web_dialog_helper_)
-    web_dialog_helper_.reset(new WebDialogHelper(owner_window()));
-  web_dialog_helper_->EnumerateDirectory(guest, request_id, path);
+    FileSelectHelper::EnumerateDirectory(guest, request_id, path);
 }
 
 void CommonWebContentsDelegate::EnterFullscreenModeForTab(

diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h
@@ -20,7 +20,6 @@ namespace atom {
 
 class AtomBrowserContext;
 class NativeWindow;
-class WebDialogHelper;
 
 class CommonWebContentsDelegate
     : public content::WebContentsDelegate,
@@ -144,7 +143,6 @@ class CommonWebContentsDelegate
   // Whether window is fullscreened by window api.
   bool native_fullscreen_;
 
-  std::unique_ptr<WebDialogHelper> web_dialog_helper_;
   scoped_refptr<DevToolsFileSystemIndexer> devtools_file_system_indexer_;
 
   // Make sure BrowserContext is alwasys destroyed after WebContents.

diff --git a/atom/browser/web_dialog_helper.cc b/atom/browser/web_dialog_helper.cc
diff --git a/atom/browser/web_dialog_helper.h b/atom/browser/web_dialog_helper.h
diff --git a/brave/browser/brave_browser_context.cc b/brave/browser/brave_browser_context.cc
@@ -637,6 +637,14 @@ BraveBrowserContext::GetIOTaskRunner() {
       GetPath(), BrowserThread::GetBlockingPool());
 }
 
+base::FilePath BraveBrowserContext::last_selected_directory() {
+      return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory);
+}
+
+void BraveBrowserContext::set_last_selected_directory(const base::FilePath& path) {
+    GetPrefs()->SetFilePath(prefs::kSelectFileLastDirectory, path);
+}
+
 }  // namespace brave
 
 namespace atom {

diff --git a/brave/browser/brave_browser_context.h b/brave/browser/brave_browser_context.h
@@ -87,6 +87,8 @@ class BraveBrowserContext : public Profile {
   bool HasOffTheRecordProfile() override;
   Profile* GetOriginalProfile() override;
   bool IsSameProfile(Profile* profile) override;
+  base::FilePath last_selected_directory() override;
+  void set_last_selected_directory(const base::FilePath& path) override;
 
   user_prefs::PrefRegistrySyncable* pref_registry() const override {
     return pref_registry_.get(); }