Merge 85823

Source/WebKit/chromium/src/ChromeClientImpl.cpp

 /*
  * 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 144 matching lines @@
     , m_scrollbarsVisible(true)
     , m_menubarVisible(true)
     , m_resizable(true)
 {
 }
 
 ChromeClientImpl::~ChromeClientImpl()
 {
 }
 
+void* ChromeClientImpl::webView() const
+{
+    return static_cast<void*>(m_webView);
+}
+
 void ChromeClientImpl::chromeDestroyed()
 {
     // Our lifetime is bound to the WebViewImpl.
 }
 
 void ChromeClientImpl::setWindowRect(const FloatRect& r)
 {
     if (m_webView->client())
         m_webView->client()->setWindowRect(IntRect(r));
 }
@@ skipping 746 matching lines @@
 {
     return adoptRef(new SearchPopupMenuChromium(client));
 }
 
 void ChromeClientImpl::willRunModalDialogDuringPageDismissal(const DialogType& dialogType) const
 {
     PlatformBridge::histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", static_cast<int>(dialogType), static_cast<int>(NumDialogTypes));
 }
 
 } // namespace WebKit