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

No need to define WebContentsPreferences::From

Browse source
This commit is contained in:
Cheng Zhao 2015-09-07 15:55:08 +08:00
parent 3717f5b7f2
commit 24bbe5dabf
3 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_web_view_manager.cc
View file

@ -10,6 +10,8 @@
#include "content/public/browser/browser_context.h"
#include "native_mate/dictionary.h"
using atom::WebContentsPreferences;
namespace mate {
template<>
@ -48,7 +50,7 @@ void AddGuest(int guest_instance_id,
manager->AddGuest(guest_instance_id, element_instance_id, embedder,
guest_web_contents);
atom::WebContentsPreferences::From(guest_web_contents)->Merge(options);
WebContentsPreferences::FromWebContents(guest_web_contents)->Merge(options);
}
void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {