Merge remote-tracking branch 'remotes/upstream/master' into JsBinding_WIP

Author: amaitland

CefSharp.Core/Internals/RenderClientAdapter.h

@@ -128,6 +128,31 @@ namespace CefSharp
                 return cefBrowser->GetMainFrame();
             };
 
+            void ShowDevTools()
+            {
+                auto cefHost = TryGetCefHost();
+
+                if (cefHost != nullptr)
+                {
+                    CefWindowInfo windowInfo;
+                    CefBrowserSettings settings;
+
+                    windowInfo.SetAsPopup(cefHost->GetWindowHandle(), "DevTools");
+                
+                    cefHost->ShowDevTools(windowInfo, this, settings);
+                }
+            }
+
+            void CloseDevTools()
+            {
+                auto cefHost = TryGetCefHost();
+
+                if (cefHost != nullptr)
+                {
+                    cefHost->CloseDevTools();
+                }
+            }
+
         private:
 
             void SetBuffer(BitmapInfo^ bitmapInfo, int newWidth, int newHeight, const void* buffer)

CefSharp.Core/ManagedCefBrowserAdapter.h

@@ -450,6 +450,16 @@ namespace CefSharp
             }
         }
 
+        void ShowDevTools()
+        {
+            _renderClientAdapter->ShowDevTools();
+        }
+
+        void CloseDevTools()
+        {
+            _renderClientAdapter->CloseDevTools();
+        }
+
         virtual void Error(Exception^ ex)
         {
 

CefSharp.WinForms.Example/BrowserForm.Designer.cs

@@ -250,5 +250,15 @@ private void CopySourceToClipBoardAsyncClick(object sender, EventArgs e)
             },
             TaskScheduler.FromCurrentSynchronizationContext());
         }
+
+        private void ShowDevToolsMenuItemClick(object sender, EventArgs e)
+        {
+            browser.ShowDevTools();
+        }
+
+        private void CloseDevToolsMenuItemClick(object sender, EventArgs e)
+        {
+            browser.CloseDevTools();
+        }
     }
 }

CefSharp.WinForms.Example/BrowserForm.cs

@@ -249,15 +249,14 @@ public void StopFinding(bool clearSelection)
             managedCefBrowserAdapter.StopFinding(clearSelection);
         }
 
-        void IWebBrowserInternal.ShowDevTools()
+        public void ShowDevTools()
         {
-            // TODO: Do something about this one.
-            throw new NotImplementedException("Implement when Cef upgraded to 1750.");
+            managedCefBrowserAdapter.ShowDevTools();
         }
 
-        void IWebBrowserInternal.CloseDevTools()
+        public void CloseDevTools()
         {
-            throw new NotImplementedException("Implement when Cef upgraded to 1750.");
+            managedCefBrowserAdapter.CloseDevTools();
         }
 
         public void Stop()

CefSharp.WinForms/ChromiumWebBrowser.cs

@@ -1051,15 +1051,14 @@ private void ZoomReset()
             });
         }
 
-        void IWebBrowserInternal.ShowDevTools()
+        public void ShowDevTools()
         {
-            // TODO: Do something about this one.
-            throw new NotImplementedException("Implement when Cef upgraded to 1750.");
+            managedCefBrowserAdapter.ShowDevTools();
         }
 
-        void IWebBrowserInternal.CloseDevTools()
+        public void CloseDevTools()
         {
-            throw new NotImplementedException("Implement when Cef upgraded to 1750.");
+            managedCefBrowserAdapter.CloseDevTools();
         }
 
         void IWebBrowserInternal.OnFrameLoadStart(string url, bool isMainFrame)

CefSharp.Wpf/ChromiumWebBrowser.cs

@@ -242,5 +242,15 @@ public interface IWebBrowser : IDisposable
         /// Opens a Print Dialog which if used (can be user cancelled) will print the browser contents.
         /// </summary>
         void Print();
+
+        /// <summary>
+        /// Open developer tools in its own window. 
+        /// </summary>
+        void ShowDevTools();
+
+        /// <summary>
+        /// Explicitly close the developer tools window if one exists for this browser instance.
+        /// </summary>
+        void CloseDevTools();               
     }
 }

CefSharp/IWebBrowser.cs

@@ -13,8 +13,6 @@ public interface IWebBrowserInternal : IWebBrowser
         void SetNavState(bool canGoBack, bool canGoForward, bool canReload);
         void SetTitle(string title);
         void SetTooltipText(string tooltipText);
-        void ShowDevTools();
-        void CloseDevTools();
 
         void OnFrameLoadStart(string url, bool isMainFrame);
         void OnFrameLoadEnd(string url, bool isMainFrame, int httpStatusCode);