github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge screw-up

Browse Source
This commit is contained in:
Nathan Sobo
2012-08-29 23:27:30 -06:00
parent c24c9e2003
commit 3cc8297460
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
native/atom_cef_client.cpp
View File

@@ -30,15 +30,17 @@ bool AtomCefClient::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
hasArguments ? Open(argumentList->GetString(1)) : Open();
return true;
}
else if (name == "newWindow") {
if (name == "newWindow") {
NewWindow();
return true;
}
else if (name == "toggleDevTools") {
if (name == "toggleDevTools") {
ToggleDevTools(browser);
return true;
}
else {
return false;
}
if (name == "confirm") {
std::string message = argumentList->GetString(1).ToString();
std::string detailedMessage = argumentList->GetString(2).ToString();
@@ -51,7 +53,7 @@ bool AtomCefClient::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
return true;
}
return true;
return false;
}
@@ -103,7 +105,7 @@ bool AtomCefClient::OnKeyEvent(CefRefPtr<CefBrowser> browser,
else {
return false;
}
return true;
}