mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: stop using a RenderWidgetHost observer in FileSelectHelper (#38168)

Browse source 
chore: stop using a RenderWidgetHost observer in FileSelectHelper
This commit is contained in:
Shelley Vohr 2023-05-04 21:43:29 +02:00 • committed by GitHub
parent ec75172d68
commit f8d534f33e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shell/browser/file_select_helper.cc
View file

@ -29,8 +29,6 @@
#include "content/public/browser/file_select_listener.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
#include "net/base/filename_util.h"
#include "net/base/mime_util.h"
@ -46,8 +44,6 @@ using blink::mojom::FileChooserFileInfoPtr;
using blink::mojom::FileChooserParams;
using blink::mojom::FileChooserParamsPtr;
using content::BrowserThread;
using content::RenderViewHost;
using content::RenderWidgetHost;
using content::WebContents;
namespace {
@ -377,9 +373,7 @@ void FileSelectHelper::RunFileChooser(
render_frame_host_ = render_frame_host;
web_contents_ = WebContents::FromRenderFrameHost(render_frame_host);
listener_ = std::move(listener);
observation_.Reset();
content::WebContentsObserver::Observe(web_contents_);
observation_.Observe(render_frame_host_->GetRenderViewHost()->GetWidget());
base::ThreadPool::PostTask(
FROM_HERE, {base::MayBlock()},
@ -518,13 +512,6 @@ void FileSelectHelper::EnumerateDirectoryEnd() {
Release();
}
void FileSelectHelper::RenderWidgetHostDestroyed(
content::RenderWidgetHost* widget_host) {
render_frame_host_ = nullptr;
DCHECK(observation_.IsObservingSource(widget_host));
observation_.Reset();
}
void FileSelectHelper::RenderFrameHostChanged(
content::RenderFrameHost* old_host,
content::RenderFrameHost* new_host) {

9
shell/browser/file_select_helper.h
View file

@ -42,7 +42,6 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
content::BrowserThread::DeleteOnUIThread>,
public ui::SelectFileDialog::Listener,
public content::WebContentsObserver,
public content::RenderWidgetHostObserver,
private net::DirectoryLister::DirectoryListerDelegate {
public:
// disable copy
@ -98,10 +97,6 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
void* params) override;
void FileSelectionCanceled(void* params) override;
// content::RenderWidgetHostObserver overrides.
void RenderWidgetHostDestroyed(
content::RenderWidgetHost* widget_host) override;
// content::WebContentsObserver overrides.
void RenderFrameHostChanged(content::RenderFrameHost* old_host,
content::RenderFrameHost* new_host) override;
@ -220,10 +215,6 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
struct ActiveDirectoryEnumeration;
std::unique_ptr<ActiveDirectoryEnumeration> directory_enumeration_;
base::ScopedObservation<content::RenderWidgetHost,
content::RenderWidgetHostObserver>
observation_{this};
// Temporary files only used on OSX. This class is responsible for deleting
// these files when they are no longer needed.
std::vector<base::FilePath> temporary_files_;