github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix naming and formatting

Browse Source 
(cherry picked from commit 25015c4c63)
This commit is contained in:
rreimann
2017-05-22 09:08:47 +02:00
parent 456e83f286
commit ab95ecda42
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
atom/browser/web_contents_preferences.cc
View File

@@ -198,7 +198,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
}
bool WebContentsPreferences::IsPreferenceEnabled(
const std::string& attributeName,
const std::string& attribute_name,
content::WebContents* web_contents) {
WebContentsPreferences* self;
if (!web_contents)
@@ -209,9 +209,9 @@ bool WebContentsPreferences::IsPreferenceEnabled(
return false;
base::DictionaryValue& web_preferences = self->web_preferences_;
bool boolValue = false;
web_preferences.GetBoolean(attributeName, &boolValue);
return boolValue;
bool bool_value = false;
web_preferences.GetBoolean(attribute_name, &bool_value);
return bool_value;
}
bool WebContentsPreferences::IsSandboxed(content::WebContents* web_contents) {

2
atom/browser/web_contents_preferences.h
View File

@@ -37,7 +37,7 @@ class WebContentsPreferences
static void AppendExtraCommandLineSwitches(
content::WebContents* web_contents, base::CommandLine* command_line);
static bool IsPreferenceEnabled(const std::string& attributeName,
static bool IsPreferenceEnabled(const std::string& attribute_name,
content::WebContents* web_contents);
static bool IsSandboxed(content::WebContents* web_contents);
static bool UsesNativeWindowOpen(content::WebContents* web_contents);

5
spec/chromium-spec.js
View File

@@ -988,10 +988,7 @@ describe('chromium feature', function () {
it('should download a pdf when plugins are disabled', function (done) {
createBrowserWindow(false)
ipcRenderer.sendSync('set-download-option', false, false)
ipcRenderer.once('download-done', function (event, state, url,
mimeType, receivedBytes,
totalBytes, disposition,
filename) {
ipcRenderer.once('download-done', function (event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename) {
assert.equal(state, 'completed')
assert.equal(filename, 'cat.pdf')
assert.equal(mimeType, 'application/pdf')