mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-21 07:58:04 +03:00
Fix merge screw-up
This commit is contained in:
parent
c24c9e2003
commit
3cc8297460
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user