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

Fix linting violations

Browse source
This commit is contained in:
rreimann 2017-05-17 16:02:42 +02:00 • committed by Kevin Sawicki
parent 1b75e45a62
commit 7982754958
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/atom_resource_dispatcher_host_delegate.cc
View file

@ -125,7 +125,8 @@ bool AtomResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
std::string* payload) { std::string* payload) {
const content::ResourceRequestInfo* info = const content::ResourceRequestInfo* info =
content::ResourceRequestInfo::ForRequest(request); content::ResourceRequestInfo::ForRequest(request);
content::WebContents* web_contents = info->GetWebContentsGetterForRequest().Run(); content::WebContents* web_contents =
info->GetWebContentsGetterForRequest().Run();
if (mime_type == "application/pdf" && info->IsMainFrame() && if (mime_type == "application/pdf" && info->IsMainFrame() &&
WebContentsPreferences::IsPluginsEnabled(web_contents)) { WebContentsPreferences::IsPluginsEnabled(web_contents)) {
*origin = GURL(kPdfViewerUIOrigin); *origin = GURL(kPdfViewerUIOrigin);

3
atom/browser/web_contents_preferences.cc
View file

@ -237,7 +237,8 @@ bool WebContentsPreferences::UsesNativeWindowOpen(
return use; return use;
} }
bool WebContentsPreferences::IsPluginsEnabled(content::WebContents* web_contents) { bool WebContentsPreferences::IsPluginsEnabled(
content::WebContents* web_contents) {
WebContentsPreferences* self; WebContentsPreferences* self;
if (!web_contents) if (!web_contents)
return false; return false;