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

browser: fix retrieving webcontents from associated process id

Browse source
This commit is contained in:
Robo 2016-03-14 03:53:39 +05:30
parent b2059ec8af
commit 48064ee7e9
2 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/atom_browser_client.cc
View file

@ -46,11 +46,6 @@ namespace atom {
namespace {
// The default routing id of WebContents.
// In Electron each RenderProcessHost only has one WebContents, so this ID is
// same for every WebContents.
int kDefaultRoutingID = 1;
// Next navigation should not restart renderer process.
bool g_suppress_renderer_process_restart = false;
@ -278,8 +273,8 @@ brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
void AtomBrowserClient::WebNotificationAllowed(
int render_process_id,
const base::Callback<void(bool)>& callback) {
content::WebContents* web_contents = content::WebContents::FromRenderViewHost(
content::RenderViewHost::FromID(render_process_id, kDefaultRoutingID));
content::WebContents* web_contents =
WebContentsPreferences::GetWebContentsFromProcessID(render_process_id);
if (!web_contents) {
callback.Run(false);
return;