Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
Fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
bbondy committed Jan 31, 2016
1 parent 5aec0c0 commit ef47e55
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 4 additions & 2 deletions atom/browser/api/atom_api_web_contents.cc
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,8 @@ void WebContents::AddNewContents(content::WebContents* source,
"ATOM_SHELL_GUEST_VIEW_MANAGER_TAB_OPEN",
new_tab_event,
"about:blank",
delayed_load_url_params_.get() ? new_contents->GetMainFrame()->GetFrameName() : "",
delayed_load_url_params_.get()
? new_contents->GetMainFrame()->GetFrameName() : "",
disposition,
*options);
return;
Expand Down Expand Up @@ -402,7 +403,8 @@ void WebContents::AddNewContents(content::WebContents* source,
"ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN",
window_open_event,
"about:blank",
delayed_load_url_params_.get() ? new_contents->GetMainFrame()->GetFrameName() : "",
delayed_load_url_params_.get()
? new_contents->GetMainFrame()->GetFrameName() : "",
*options);
return;
}
Expand Down
6 changes: 4 additions & 2 deletions atom/renderer/api/atom_api_web_frame.cc
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,11 @@ void WebFrame::AttachGuest(int id) {
// This results in the BrowserPluginGuest trying to access the native
// window before it's actually ready. This hack works around that
// by always delaying the access
content::BrowserPluginManager::Get()->GetBrowserPlugin(id)->updateVisibility(false);
content::BrowserPluginManager::Get()
->GetBrowserPlugin(id)->updateVisibility(false);
content::RenderFrame::FromWebFrame(web_frame_)->AttachGuest(id);
content::BrowserPluginManager::Get()->GetBrowserPlugin(id)->updateVisibility(true);
content::BrowserPluginManager::Get()
->GetBrowserPlugin(id)->updateVisibility(true);
}

void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
Expand Down
1 change: 0 additions & 1 deletion atom/renderer/atom_renderer_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ bool AtomRendererClient::ShouldFork(blink::WebLocalFrame* frame,
bool is_initial_navigation,
bool is_server_redirect,
bool* send_referrer) {

base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kNodeIntegration) &&
command_line->GetSwitchValueASCII(switches::kNodeIntegration) == "true") {
Expand Down

0 comments on commit ef47e55

Please sign in to comment.