Merge 85823

Source/WebKit/chromium/src/ChromeClientImpl.h

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 40 matching lines @@
 class WebViewImpl;
 struct WebCursorInfo;
 struct WebPopupMenuInfo;
 
 // Handles window-level notifications from WebCore on behalf of a WebView.
 class ChromeClientImpl : public WebCore::ChromeClientChromium {
 public:
     explicit ChromeClientImpl(WebViewImpl* webView);
     virtual ~ChromeClientImpl();
 
-    WebViewImpl* webView() const { return m_webView; }
+    virtual void* webView() const;
 
     // ChromeClient methods:
     virtual void chromeDestroyed();
     virtual void setWindowRect(const WebCore::FloatRect&);
     virtual WebCore::FloatRect windowRect();
     virtual WebCore::FloatRect pageRect();
     virtual float scaleFactor();
     virtual void focus();
     virtual void unfocus();
     virtual bool canTakeFocus(WebCore::FocusDirection);
@@ skipping 132 matching lines @@
     bool m_toolbarsVisible;
     bool m_statusbarVisible;
     bool m_scrollbarsVisible;
     bool m_menubarVisible;
     bool m_resizable;
 };
 
 } // namespace WebKit
 
 #endif