This reverts commit 6e43b0bcbf
.
This commit is contained in:
parent
09d160f406
commit
cac871c027
9 changed files with 80 additions and 17 deletions
|
@ -176,7 +176,11 @@ void WebContentsPreferences::Clear() {
|
|||
void WebContentsPreferences::SetFromDictionary(
|
||||
const gin_helper::Dictionary& web_preferences) {
|
||||
Clear();
|
||||
Merge(web_preferences);
|
||||
}
|
||||
|
||||
void WebContentsPreferences::Merge(
|
||||
const gin_helper::Dictionary& web_preferences) {
|
||||
web_preferences.Get(options::kPlugins, &plugins_);
|
||||
web_preferences.Get(options::kExperimentalFeatures, &experimental_features_);
|
||||
web_preferences.Get(options::kNodeIntegration, &node_integration_);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue