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

Fix compilation errors on Windows

Browse source
This commit is contained in:
Cheng Zhao 2016-04-01 16:34:20 +09:00
parent 6f7a98d7c9
commit 576b54320a
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_app.cc
View file

@ -242,7 +242,7 @@ void App::OnCreateWindow(const GURL& target_url,
content::WebContents::FromRenderFrameHost(rfh); content::WebContents::FromRenderFrameHost(rfh);
if (web_contents) { if (web_contents) {
auto api_web_contents = WebContents::CreateFrom(isolate(), web_contents); auto api_web_contents = WebContents::CreateFrom(isolate(), web_contents);
api_web_contents->CreateWindow(target_url, frame_name, disposition); api_web_contents->OnCreateWindow(target_url, frame_name, disposition);
} }
} }

6
atom/browser/api/atom_api_web_contents.cc
View file

@ -316,9 +316,9 @@ bool WebContents::AddMessageToConsole(content::WebContents* source,
} }
} }
void WebContents::CreateWindow(const GURL& target_url, void WebContents::OnCreateWindow(const GURL& target_url,
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition) { WindowOpenDisposition disposition) {
if (type_ == BROWSER_WINDOW) if (type_ == BROWSER_WINDOW)
Emit("-new-window", target_url, frame_name, disposition); Emit("-new-window", target_url, frame_name, disposition);
else else

6
atom/browser/api/atom_api_web_contents.h
View file

@ -139,9 +139,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
bool allowed); bool allowed);
// Create window with the given disposition. // Create window with the given disposition.
void CreateWindow(const GURL& target_url, void OnCreateWindow(const GURL& target_url,
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition); WindowOpenDisposition disposition);
// Returns the web preferences of current WebContents. // Returns the web preferences of current WebContents.
v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate); v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);