github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-28 00:38:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

No need to get BrowserContext from NativeWindow

Browse Source
This commit is contained in:
Cheng Zhao
2018-03-06 15:32:00 +09:00
parent 702f1631a3
commit 8bbe28e998
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
atom/browser/native_window_mac.mm
View File

@@ -990,7 +990,6 @@ NativeWindowMac::NativeWindowMac(
NativeWindowMac::~NativeWindowMac() {
[NSEvent removeMonitor:wheel_event_monitor_];
Observe(nullptr);
}
void NativeWindowMac::Close() {

8
atom/browser/web_dialog_helper.cc
View File

@@ -235,12 +235,8 @@ void WebDialogHelper::RunFileChooser(
NOTREACHED();
}
AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
window_->web_contents()->GetBrowserContext());
if (!browser_context) {
browser_context = static_cast<atom::AtomBrowserContext*>(
render_frame_host->GetProcess()->GetBrowserContext());
}
auto* browser_context = static_cast<atom::AtomBrowserContext*>(
render_frame_host->GetProcess()->GetBrowserContext());
settings.default_path = browser_context->prefs()->GetFilePath(
prefs::kSelectFileLastDirectory).Append(params.default_file_name);
settings.properties = flags;