From 3cc82974608c484ddae46e222fbc792e31a6b760 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 29 Aug 2012 23:27:30 -0600
Subject: [PATCH] Fix merge screw-up

---
 native/atom_cef_client.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/native/atom_cef_client.cpp b/native/atom_cef_client.cpp
index e3ecfc83f..c1dc2cbe9 100644
--- a/native/atom_cef_client.cpp
+++ b/native/atom_cef_client.cpp
@@ -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;
 }