Merge 85823

Source/WebKit/win/WebCoreSupport/WebChromeClient.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 25 matching lines @@
 class WebDesktopNotificationsDelegate;
 
 interface IWebUIDelegate;
 
 class WebChromeClient : public WebCore::ChromeClient {
 public:
     WebChromeClient(WebView*);
 
     virtual void chromeDestroyed();
 
+    virtual void* webView() const { return 0; }
     virtual void setWindowRect(const WebCore::FloatRect&);
     virtual WebCore::FloatRect windowRect();
     
     virtual WebCore::FloatRect pageRect();
     
     virtual float scaleFactor();
 
     virtual void focus();
     virtual void unfocus();
 
@@ skipping 123 matching lines @@
 
 private:
     COMPtr<IWebUIDelegate> uiDelegate();
 
     WebView* m_webView;
 
 #if ENABLE(NOTIFICATIONS)
     OwnPtr<WebDesktopNotificationsDelegate> m_notificationsDelegate;
 #endif
 };