Pulling in amaitland:CefSharp feature/focus-handler changes

Author: jankurianski

CefSharp.Core/Internals/ClientAdapter.cpp

@@ -373,9 +373,33 @@ namespace CefSharp
             }
         }
 
+        void ClientAdapter::OnGotFocus(CefRefPtr<CefBrowser> browser)
+        {
+            auto winFormsControl = dynamic_cast<IWinFormsWebBrowser^>((IWebBrowserInternal^)_browserControl);
+            if (winFormsControl != nullptr)
+            {
+                winFormsControl->OnGotFocus();
+            }
+        }
+
+        bool ClientAdapter::OnSetFocus(CefRefPtr<CefBrowser> browser,  FocusSource source)
+        {
+            auto winFormsControl = dynamic_cast<IWinFormsWebBrowser^>((IWebBrowserInternal^)_browserControl);
+            if (winFormsControl == nullptr)
+            {
+                return false;
+            }
+
+            return winFormsControl->OnSetFocus((CefFocusSource)source);
+        }
+
         void ClientAdapter::OnTakeFocus(CefRefPtr<CefBrowser> browser, bool next)
         {
-            _browserControl->OnTakeFocus(next);
+            auto winFormsControl = dynamic_cast<IWinFormsWebBrowser^>((IWebBrowserInternal^)_browserControl);
+            if (winFormsControl != nullptr)
+            {
+                winFormsControl->OnTakeFocus(next);
+            }
         }
 
         bool ClientAdapter::OnJSDialog(CefRefPtr<CefBrowser> browser, const CefString& origin_url, const CefString& accept_lang,

CefSharp.Core/Internals/ClientAdapter.h

@@ -104,6 +104,8 @@ namespace CefSharp
                 CefRefPtr<CefContextMenuParams> params, CefRefPtr<CefMenuModel> model) OVERRIDE;
 
             // CefFocusHandler
+            virtual DECL void OnGotFocus(CefRefPtr<CefBrowser> browser) OVERRIDE;
+            virtual DECL bool OnSetFocus(CefRefPtr<CefBrowser> browser, FocusSource source) OVERRIDE;
             virtual DECL void OnTakeFocus(CefRefPtr<CefBrowser> browser, bool next) OVERRIDE;
 
             // CefKeyboardHandler

CefSharp.WinForms/ChromiumWebBrowser.cs

@@ -208,7 +208,17 @@ void IWebBrowserInternal.OnFrameLoadEnd(string url, bool isMainFrame, int httpSt
             }
         }
 
-        void IWebBrowserInternal.OnTakeFocus(bool next)
+        void IWinFormsWebBrowser.OnGotFocus()
+        {
+            
+        }
+
+        bool IWinFormsWebBrowser.OnSetFocus(CefFocusSource source)
+        {
+            return false;
+        }
+
+        void IWinFormsWebBrowser.OnTakeFocus(bool next)
         {
             SelectNextControl(this, next, true, true, true);
         }

CefSharp.Wpf/ChromiumWebBrowser.cs

@@ -1125,11 +1125,6 @@ void IWebBrowserInternal.OnFrameLoadEnd(string url, bool isMainFrame, int httpSt
             }
         }
 
-        void IWebBrowserInternal.OnTakeFocus(bool next)
-        {
-            throw new NotImplementedException();
-        }
-
         void IWebBrowserInternal.OnConsoleMessage(string message, string source, int line)
         {
             var handler = ConsoleMessage;

CefSharp/CefFocusSource.cs

@@ -0,0 +1,21 @@
+// Copyright © 2010-2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+namespace CefSharp
+{
+	/// <summary>
+	/// Focus Source
+	/// </summary>
+	public enum CefFocusSource
+	{
+		///
+		// The source is explicit navigation via the API (LoadURL(), etc).
+		///
+		FocusSourceNavigation = 0,
+		///
+		// The source is a system-generated focus event.
+		///
+		FocusSourceSystem
+	}
+}

CefSharp/CefSharp.csproj

@@ -114,6 +114,7 @@
     <Compile Include="TransitionType.cs" />
     <Compile Include="NavStateChangedEventArgs.cs" />
     <Compile Include="ICompletionHandler.cs" />
+    <Compile Include="CefFocusSource.cs" />
     <Compile Include="Internals\BitmapInfo.cs" />
     <Compile Include="Internals\IBrowserProcess.cs" />
     <Compile Include="Internals\JavascriptMethod.cs" />

CefSharp/IWinFormsWebBrowser.cs

@@ -20,5 +20,9 @@ public interface IWinFormsWebBrowser : IWebBrowser
         void Paste();
         void Delete();
         void SelectAll();
+
+        void OnGotFocus();
+        bool OnSetFocus(CefFocusSource source);
+        void OnTakeFocus(bool next);
     }
 }

CefSharp/Internals/IWebBrowserInternal.cs

@@ -16,7 +16,6 @@ public interface IWebBrowserInternal : IWebBrowser
 
         void OnFrameLoadStart(string url, bool isMainFrame);
         void OnFrameLoadEnd(string url, bool isMainFrame, int httpStatusCode);
-        void OnTakeFocus(bool next);
         void OnConsoleMessage(string message, string source, int line);
         void OnStatusMessage(string value);
         void OnLoadError(string url, CefErrorCode errorCode, string errorText);