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

Fix naming and formatting

Browse source
This commit is contained in:
rreimann 2017-05-22 09:08:47 +02:00 • committed by Kevin Sawicki
parent 791486433d
commit 25015c4c63
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

@ -207,7 +207,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
} }
bool WebContentsPreferences::IsPreferenceEnabled( bool WebContentsPreferences::IsPreferenceEnabled(
const std::string& attributeName, const std::string& attribute_name,
content::WebContents* web_contents) { content::WebContents* web_contents) {
WebContentsPreferences* self; WebContentsPreferences* self;
if (!web_contents) if (!web_contents)
@ -218,9 +218,9 @@ bool WebContentsPreferences::IsPreferenceEnabled(
return false; return false;
base::DictionaryValue& web_preferences = self->web_preferences_; base::DictionaryValue& web_preferences = self->web_preferences_;
bool boolValue = false; bool bool_value = false;
web_preferences.GetBoolean(attributeName, &boolValue); web_preferences.GetBoolean(attribute_name, &bool_value);
return boolValue; return bool_value;
} }
bool WebContentsPreferences::IsSandboxed(content::WebContents* web_contents) { 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( static void AppendExtraCommandLineSwitches(
content::WebContents* web_contents, base::CommandLine* command_line); 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); content::WebContents* web_contents);
static bool IsSandboxed(content::WebContents* web_contents); static bool IsSandboxed(content::WebContents* web_contents);
static bool UsesNativeWindowOpen(content::WebContents* web_contents); static bool UsesNativeWindowOpen(content::WebContents* web_contents);

5
spec/chromium-spec.js
View file

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