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

also format missing .cc files

Browse source
This commit is contained in:
Shelley Vohr 2018-04-17 21:55:30 -04:00
parent 53bdf22c85
commit c6f4bbd143
No known key found for this signature in database
GPG key ID: F13993A75599653C
181 changed files with 4102 additions and 4254 deletions
Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/web_contents_preferences.cc
View file

@ -73,22 +73,22 @@ WebContentsPreferences::WebContentsPreferences(
} else {
SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
}
#if defined(OS_MACOSX)
#if defined(OS_MACOSX)
SetDefaultBoolIfUndefined(options::kScrollBounce, false);
#endif
#endif
SetDefaultBoolIfUndefined("offscreen", false);
last_dict_ = std::move(*dict_.CreateDeepCopy());
}
WebContentsPreferences::~WebContentsPreferences() {
instances_.erase(
std::remove(instances_.begin(), instances_.end(), this),
instances_.end());
instances_.erase(std::remove(instances_.begin(), instances_.end(), this),
instances_.end());
}
bool WebContentsPreferences::SetDefaultBoolIfUndefined(
const base::StringPiece& key, bool val) {
const base::StringPiece& key,
bool val) {
bool existing;
if (!dict_.GetBoolean(key, &existing)) {
dict_.SetBoolean(key, val);
@ -186,8 +186,7 @@ void WebContentsPreferences::AppendCommandLineSwitches(
// Custom args for renderer process
base::Value* customArgs;
if (dict_.Get(options::kCustomArgs, &customArgs) &&
customArgs->is_list()) {
if (dict_.Get(options::kCustomArgs, &customArgs) && customArgs->is_list()) {
for (const base::Value& customArg : customArgs->GetList()) {
if (customArg.is_string())
command_line->AppendArg(customArg.GetString());