Move modal dialogs from WebViewClient to WebFrameClient, part 2/3.

Source/web/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 370 matching lines @@
     }
 }
 
 bool ChromeClientImpl::canRunBeforeUnloadConfirmPanel()
 {
     return !!m_webView->client();
 }
 
 bool ChromeClientImpl::runBeforeUnloadConfirmPanel(const String& message, LocalFrame* frame)
 {
-    if (m_webView->client()) {
-        return m_webView->client()->runModalBeforeUnloadDialog(
-            WebFrameImpl::fromFrame(frame), message);
-    }
+    WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);
+
+    bool isReload = false;
+    WebDataSource* ds = webframe->provisionalDataSource();
+    if (ds)
+        isReload = (ds->navigationType() == blink::WebNavigationTypeReload);
+
+    if (webframe->client())
+        return webframe->client()->runModalBeforeUnloadDialog(isReload, message);
     return false;
 }
 
 void ChromeClientImpl::closeWindowSoon()
 {
     // Make sure this Page can no longer be found by JS.
     Page::ordinaryPages().remove(m_webView->page());
 
     // Make sure that all loading is stopped.  Ensures that JS stops executing!
     m_webView->mainFrame()->stopLoading();
 
     if (m_webView->client())
         m_webView->client()->closeWidgetSoon();
 }
 
 // Although a LocalFrame is passed in, we don't actually use it, since we
 // already know our own m_webView.
 void ChromeClientImpl::runJavaScriptAlert(LocalFrame* frame, const String& message)
 {
-    if (m_webView->client()) {
+    WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);
+    if (webframe->client()) {
         if (WebUserGestureIndicator::isProcessingUserGesture())
             WebUserGestureIndicator::currentUserGestureToken().setJavascriptPrompt();
-        m_webView->client()->runModalAlertDialog(
-            WebFrameImpl::fromFrame(frame), message);
+        webframe->client()->runModalAlertDialog(message);
     }
 }
 
 // See comments for runJavaScriptAlert().
 bool ChromeClientImpl::runJavaScriptConfirm(LocalFrame* frame, const String& message)
 {
-    if (m_webView->client()) {
+    WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);
+    if (webframe->client()) {
         if (WebUserGestureIndicator::isProcessingUserGesture())
             WebUserGestureIndicator::currentUserGestureToken().setJavascriptPrompt();
-        return m_webView->client()->runModalConfirmDialog(
-            WebFrameImpl::fromFrame(frame), message);
+        return webframe->client()->runModalConfirmDialog(message);
     }
     return false;
 }
 
 // See comments for runJavaScriptAlert().
 bool ChromeClientImpl::runJavaScriptPrompt(LocalFrame* frame,
                                            const String& message,
                                            const String& defaultValue,
                                            String& result)
 {
-    if (m_webView->client()) {
+    WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);
+    if (webframe->client()) {
         if (WebUserGestureIndicator::isProcessingUserGesture())
             WebUserGestureIndicator::currentUserGestureToken().setJavascriptPrompt();
         WebString actualValue;
-        bool ok = m_webView->client()->runModalPromptDialog(
-            WebFrameImpl::fromFrame(frame),
+        bool ok = webframe->client()->runModalPromptDialog(
             message,
             defaultValue,
             &actualValue);
         if (ok)
             result = actualValue;
         return ok;
     }
     return false;
 }
 
@@ skipping 507 matching lines @@
 {
     return static_cast<NavigatorContentUtilsClient::CustomHandlersState>(m_webView->client()->isProtocolHandlerRegistered(scheme, baseURL, url));
 }
 
 void NavigatorContentUtilsClientImpl::unregisterProtocolHandler(const String& scheme, const WebCore::KURL& baseURL, const WebCore::KURL& url)
 {
     m_webView->client()->unregisterProtocolHandler(scheme, baseURL, url);
 }
 
 } // namespace blink