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

public/web/WebViewClient.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 140 matching lines @@
 
     // This method is called in response to WebView's handleInputEvent()
     // when the default action for the current keyboard event is not
     // suppressed by the page, to give the embedder a chance to handle
     // the keyboard event specially.
     //
     // Returns true if the keyboard event was handled by the embedder,
     // indicating that the default action should be suppressed.
     virtual bool handleCurrentKeyboardEvent() { return false; }
 
+
     // Dialogs -------------------------------------------------------------
 
     // This method opens the color chooser and returns a new WebColorChooser
     // instance. If there is a WebColorChooser already from the last time this
     // was called, it ends the color chooser by calling endChooser, and replaces
     // it with the new one. The given list of suggestions can be used to show a
     // simple interface with a limited set of choices.
 
     // FIXME: Should be removed when the chromium side change lands.
     virtual WebColorChooser* createColorChooser(WebColorChooserClient*,
@@ skipping 22 matching lines @@
     // besides the anchor rectangle. An implementation of this function should
     // not hide the popup until hideValidationMessage call.
     virtual void showValidationMessage(const WebRect& anchorInRootView, const WebString& mainText, const WebString& supplementalText, WebTextDirection hint) { }
 
     // Hide notifation popup for form validation messages.
     virtual void hideValidationMessage() { }
 
     // Move the existing notifation popup to the new anchor position.
     virtual void moveValidationMessage(const WebRect& anchorInRootView) { }
 
-    // Displays a modal alert dialog containing the given message.  Returns
-    // once the user dismisses the dialog.
-    virtual void runModalAlertDialog(
-        WebLocalFrame*, const WebString& message) { }
-
-    // Displays a modal confirmation dialog with the given message as
-    // description and OK/Cancel choices.  Returns true if the user selects
-    // 'OK' or false otherwise.
-    virtual bool runModalConfirmDialog(
-        WebLocalFrame*, const WebString& message) { return false; }
-
-    // Displays a modal input dialog with the given message as description
-    // and OK/Cancel choices.  The input field is pre-filled with
-    // defaultValue.  Returns true if the user selects 'OK' or false
-    // otherwise.  Upon returning true, actualValue contains the value of
-    // the input field.
-    virtual bool runModalPromptDialog(
-        WebLocalFrame*, const WebString& message, const WebString& defaultValue,
-        WebString* actualValue) { return false; }
-
-    // Displays a modal confirmation dialog containing the given message as
-    // description and OK/Cancel choices, where 'OK' means that it is okay
-    // to proceed with closing the view.  Returns true if the user selects
-    // 'OK' or false otherwise.
-    virtual bool runModalBeforeUnloadDialog(
-        WebLocalFrame*, const WebString& message) { return true; }
-
 
     // UI ------------------------------------------------------------------
 
     // Called when script modifies window.status
     virtual void setStatusText(const WebString&) { }
 
     // Called when hovering over an anchor with the given URL.
     virtual void setMouseOverURL(const WebURL&) { }
 
     // Called when keyboard focus switches to an anchor with the given URL.
@@ skipping 22 matching lines @@
     // After calling WebWidget::layout(), expect to get this notification
     // unless the view did not need a layout.
     virtual void didUpdateLayout() { }
 
     // Return true to swallow the input event if the embedder will start a disambiguation popup
     virtual bool didTapMultipleTargets(const WebGestureEvent&, const WebVector<WebRect>& targetRects) { return false; }
 
     // Returns comma separated list of accept languages.
     virtual WebString acceptLanguages() { return WebString(); }
 
+
     // Session history -----------------------------------------------------
 
     // Tells the embedder to navigate back or forward in session history by
     // the given offset (relative to the current position in session
     // history).
     virtual void navigateBackForwardSoon(int offset) { }
 
     // Returns the number of history items before/after the current
     // history item.
     virtual int historyBackListCount() { return 0; }
     virtual int historyForwardListCount() { return 0; }
 
 
     // Accessibility -------------------------------------------------------
 
     // Notifies embedder about an accessibility event.
     virtual void postAccessibilityEvent(const WebAXObject&, WebAXEvent) { }
 
+
     // Developer tools -----------------------------------------------------
 
     // Called to notify the client that the inspector's settings were
     // changed and should be saved.  See WebView::inspectorSettings.
     virtual void didUpdateInspectorSettings() { }
 
     virtual void didUpdateInspectorSetting(const WebString& key, const WebString& value) { }
 
+
     // Geolocation ---------------------------------------------------------
 
     // Access the embedder API for (client-based) geolocation client .
     virtual WebGeolocationClient* geolocationClient() { return 0; }
     // Access the embedder API for (non-client-based) geolocation services.
     virtual WebGeolocationService* geolocationService() { return 0; }
 
+
     // Speech --------------------------------------------------------------
 
     // Access the embedder API for speech input services.
     virtual WebSpeechInputController* speechInputController(
         WebSpeechInputListener*) { return 0; }
 
     // Access the embedder API for speech recognition services.
     virtual WebSpeechRecognizer* speechRecognizer() { return 0; }
 
+
     // Zoom ----------------------------------------------------------------
 
     // Informs the browser that the zoom levels for this frame have changed from
     // the default values.
     virtual void zoomLimitsChanged(double minimumLevel, double maximumLevel) { }
 
     // Informs the browser that the zoom level has changed as a result of an
     // action that wasn't initiated by the client.
     virtual void zoomLevelChanged() { }
 
+
     // Navigator Content Utils  --------------------------------------------
 
     // Registers a new URL handler for the given protocol.
     virtual void registerProtocolHandler(const WebString& scheme,
         const WebURL& baseUrl,
         const WebURL& url,
         const WebString& title)
     {
         registerProtocolHandler(scheme, baseUrl.string(), url.string(), title);
     }
@@ skipping 16 matching lines @@
         const WebString& url,
         const WebString& title) { }
 
     virtual void unregisterProtocolHandler(const WebString& scheme, const WebString& baseUrl, const WebString& url) { }
 
     virtual WebCustomHandlersState isProtocolHandlerRegistered(const WebString& scheme, const WebString& baseUrl, const WebString& url)
     {
         return WebCustomHandlersNew;
     }
 
+
     // Visibility -----------------------------------------------------------
 
     // Returns the current visibility of the WebView.
     virtual WebPageVisibilityState visibilityState() const
     {
         return WebPageVisibilityStateVisible;
     }
 
+
     // Media Streams -------------------------------------------------------
 
     virtual WebUserMediaClient* userMediaClient() { return 0; }
 
+
     // Web MIDI -------------------------------------------------------------
 
     virtual WebMIDIClient* webMIDIClient() { return 0; }
 
     // Push Messaging -------------------------------------------------------
 
     virtual WebPushClient* webPushClient() { return 0; }
 
     // Content detection ----------------------------------------------------
 
     // Retrieves detectable content (e.g., email addresses, phone numbers)
     // around a hit test result. The embedder should use platform-specific
     // content detectors to analyze the region around the hit test result.
     virtual WebContentDetectionResult detectContentAround(const WebHitTestResult&) { return WebContentDetectionResult(); }
 
     // Schedules a new content intent with the provided url.
     virtual void scheduleContentIntent(const WebURL&) { }
 
     // Cancels any previously scheduled content intents that have not yet launched.
     virtual void cancelScheduledContentIntents() { }
 
+
     // Draggable regions ----------------------------------------------------
 
     // Informs the browser that the draggable regions have been updated.
     virtual void draggableRegionsChanged() { }
 
 protected:
     ~WebViewClient() { }
 };
 
 } // namespace blink
 
 #endif