From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Mon, 28 Jun 2010 16:42:48 +0100 Subject: Merge WebKit at r61871: Initial merge by git. Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5 --- WebKit/chromium/public/WebView.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'WebKit/chromium/public/WebView.h') diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h index 9054d8c..eadfc26 100644 --- a/WebKit/chromium/public/WebView.h +++ b/WebKit/chromium/public/WebView.h @@ -38,6 +38,7 @@ namespace WebKit { class WebAccessibilityObject; class WebDevToolsAgent; +class WebDevToolsAgentClient; class WebDragData; class WebFrame; class WebFrameClient; @@ -55,8 +56,8 @@ public: // Creates a WebView that is NOT yet initialized. You will need to // call initializeMainFrame to finish the initialization. It is valid - // to pass a null WebViewClient pointer. - WEBKIT_API static WebView* create(WebViewClient*); + // to pass null WebViewClient and WebDevToolsAgentClient pointers. + WEBKIT_API static WebView* create(WebViewClient*, WebDevToolsAgentClient* = 0); // After creating a WebView, you should immediately call this method. // You can optionally modify the settings before calling this method. -- cgit v1.1