Index: public/web/WebViewClient.h |
diff --git a/public/web/WebViewClient.h b/public/web/WebViewClient.h |
index 1a193b556faf71cd0797c2f768ec3234617073ef..cb113b0873988d66d2ad657fbd1ce840e1513cd7 100644 |
--- a/public/web/WebViewClient.h |
+++ b/public/web/WebViewClient.h |
@@ -39,6 +39,7 @@ |
#include "WebDragOperation.h" |
#include "WebFileChooserCompletion.h" |
#include "WebFileChooserParams.h" |
+#include "WebFrame.h" |
#include "WebNavigatorContentUtilsClient.h" |
#include "WebPageVisibilityState.h" |
#include "WebPopupType.h" |
@@ -58,7 +59,6 @@ class WebElement; |
class WebExternalPopupMenu; |
class WebExternalPopupMenuClient; |
class WebFileChooserCompletion; |
-class WebFrame; |
class WebGeolocationClient; |
class WebGeolocationService; |
class WebGestureEvent; |
@@ -102,7 +102,7 @@ public: |
// could be fulfilled. The client should not load the request. |
// The policy parameter indicates how the new view will be displayed in |
// WebWidgetClient::show. |
- virtual WebView* createView(WebFrame* creator, |
+ virtual WebView* createView(WebLocalFrame* creator, |
const WebURLRequest& request, |
const WebWindowFeatures& features, |
const WebString& name, |
@@ -135,7 +135,7 @@ public: |
// non-null, then it selects a particular frame, including its |
// children, to print. Otherwise, the main frame and its children |
// should be printed. |
- virtual void printPage(WebFrame*) { } |
+ virtual void printPage(WebLocalFrame*) { } |
// Called to retrieve the provider of desktop notifications. |
virtual WebNotificationPresenter* notificationPresenter() { return 0; } |
@@ -155,7 +155,7 @@ public: |
// Notification that some progress was made loading the current page. |
// loadProgress is a value between 0 (nothing loaded) and 1.0 (frame fully |
// loaded). |
- virtual void didChangeLoadProgress(WebFrame*, double loadProgress) { } |
+ virtual void didChangeLoadProgress(WebLocalFrame*, double loadProgress) { } |
// Editing ------------------------------------------------------------- |
@@ -219,13 +219,13 @@ public: |
// Displays a modal alert dialog containing the given message. Returns |
// once the user dismisses the dialog. |
virtual void runModalAlertDialog( |
- WebFrame*, const WebString& message) { } |
+ 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( |
- WebFrame*, const WebString& message) { return false; } |
+ 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 |
@@ -233,7 +233,7 @@ public: |
// otherwise. Upon returning true, actualValue contains the value of |
// the input field. |
virtual bool runModalPromptDialog( |
- WebFrame*, const WebString& message, const WebString& defaultValue, |
+ WebLocalFrame*, const WebString& message, const WebString& defaultValue, |
WebString* actualValue) { return false; } |
// Displays a modal confirmation dialog containing the given message as |
@@ -241,7 +241,7 @@ public: |
// to proceed with closing the view. Returns true if the user selects |
// 'OK' or false otherwise. |
virtual bool runModalBeforeUnloadDialog( |
- WebFrame*, const WebString& message) { return true; } |
+ WebLocalFrame*, const WebString& message) { return true; } |
// UI ------------------------------------------------------------------ |
@@ -256,7 +256,7 @@ public: |
virtual void setKeyboardFocusURL(const WebURL&) { } |
// Called when a drag-n-drop operation should begin. |
- virtual void startDragging(WebFrame*, const WebDragData&, WebDragOperationsMask, const WebImage&, const WebPoint& dragImageOffset) { } |
+ virtual void startDragging(WebLocalFrame*, const WebDragData&, WebDragOperationsMask, const WebImage&, const WebPoint& dragImageOffset) { } |
// Called to determine if drag-n-drop operations may initiate a page |
// navigation. |