From c8681ea3e8c514a0446ea413aff81f5e896dd532 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Mon, 11 Jul 2016 17:11:42 -0400
Subject: [PATCH] Mac: Remove duplicate focus change notification

---
 .../native/browser_platform_delegate_native_mac.mm   | 12 ------------
 tests/cefclient/browser/browser_window_std_mac.mm    |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/libcef/browser/native/browser_platform_delegate_native_mac.mm b/libcef/browser/native/browser_platform_delegate_native_mac.mm
index a5125e5da..07979d7da 100644
--- a/libcef/browser/native/browser_platform_delegate_native_mac.mm
+++ b/libcef/browser/native/browser_platform_delegate_native_mac.mm
@@ -92,18 +92,6 @@
   [super dealloc];
 }
 
-// Called when we are activated (when we gain focus).
-- (void)windowDidBecomeKey:(NSNotification*)notification {
-  if (browser_)
-    browser_->SetFocus(true);
-}
-
-// Called when we are deactivated (when we lose focus).
-- (void)windowDidResignKey:(NSNotification*)notification {
-  if (browser_)
-    browser_->SetFocus(false);
-}
-
 - (BOOL)windowShouldClose:(id)window {
   if (browser_ && !browser_->TryCloseBrowser()) {
     // Cancel the close.
diff --git a/tests/cefclient/browser/browser_window_std_mac.mm b/tests/cefclient/browser/browser_window_std_mac.mm
index 941f2091c..f1d3a44cb 100644
--- a/tests/cefclient/browser/browser_window_std_mac.mm
+++ b/tests/cefclient/browser/browser_window_std_mac.mm
@@ -60,10 +60,12 @@ void BrowserWindowStdMac::ShowPopup(ClientWindowHandle parent_handle,
 
 void BrowserWindowStdMac::Show() {
   REQUIRE_MAIN_THREAD();
+  // Nothing to do here. Chromium internally handles window show/hide.
 }
 
 void BrowserWindowStdMac::Hide() {
   REQUIRE_MAIN_THREAD();
+  // Nothing to do here. Chromium internally handles window show/hide.
 }
 
 void BrowserWindowStdMac::SetBounds(int x, int y, size_t width, size_t height) {
@@ -73,9 +75,7 @@ void BrowserWindowStdMac::SetBounds(int x, int y, size_t width, size_t height) {
 
 void BrowserWindowStdMac::SetFocus(bool focus) {
   REQUIRE_MAIN_THREAD();
-
-  if (browser_)
-    browser_->GetHost()->SetFocus(focus);
+  // Nothing to do here. Chromium internally handles window focus assignment.
 }
 
 ClientWindowHandle BrowserWindowStdMac::GetWindowHandle() const {