Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/Source/WebKit/chromium/public/WebFrameClient.h b/Source/WebKit/chromium/public/WebFrameClient.h
index 662c7c1c5..62b5f0de8 100644
--- a/Source/WebKit/chromium/public/WebFrameClient.h
+++ b/Source/WebKit/chromium/public/WebFrameClient.h
@@ -398,9 +398,9 @@ public:
         WebDOMMessageEvent) { return false; }
 
     // Asks the embedder if a specific user agent should be used for the given
-    // URL. Returns true if it should, along with the user agent. If false,
+    // URL. Non-empty strings indicate an override should be used. Otherwise,
     // WebKitPlatformSupport::userAgent() will be called to provide one.
-    virtual bool userAgent(const WebURL& url, WebString* userAgent) { return false; }
+    virtual WebString userAgentOverride(WebFrame*, const WebURL& url) { return WebString(); }
 
 protected:
     ~WebFrameClient() { }