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 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

5
atom/browser/atom_resource_dispatcher_host_delegate.cc
View File

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

3
atom/browser/web_contents_preferences.cc
View File

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