Switch to WebFrame from the WebKit API....

webkit/tools/test_shell/test_webview_delegate.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TestWebViewDelegate class:
 // This class implements the WebViewDelegate methods for the test shell.  One
 // instance is owned by each TestShell.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
@@ skipping 93 matching lines @@
   virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle);
 #endif
   virtual WebKit::WebMediaPlayer* CreateWebMediaPlayer(
       WebKit::WebMediaPlayerClient* client);
   virtual WebKit::WebWorker* CreateWebWorker(WebKit::WebWorkerClient* client);
   virtual void OpenURL(WebView* webview,
                        const GURL& url,
                        const GURL& referrer,
                        WebKit::WebNavigationPolicy policy);
   virtual void DidMovePlugin(const WebPluginGeometry& move);
-  virtual void RunJavaScriptAlert(WebFrame* webframe,
+  virtual void RunJavaScriptAlert(WebKit::WebFrame* webframe,
                                   const std::wstring& message);
-  virtual bool RunJavaScriptConfirm(WebFrame* webframe,
+  virtual bool RunJavaScriptConfirm(WebKit::WebFrame* webframe,
                                     const std::wstring& message);
-  virtual bool RunJavaScriptPrompt(WebFrame* webframe,
+  virtual bool RunJavaScriptPrompt(WebKit::WebFrame* webframe,
                                    const std::wstring& message,
                                    const std::wstring& default_value,
                                    std::wstring* result);
 
   virtual void SetStatusbarText(WebView* webview,
                                 const std::wstring& message);
 
   virtual void AddMessageToConsole(WebView* webview,
                                    const std::wstring& message,
                                    unsigned int line_no,
                                    const std::wstring& source_id);
   virtual void StartDragging(WebView* webview,
                              const WebKit::WebDragData& drag_data);
   virtual void ShowContextMenu(WebView* webview,
                                ContextNodeType node_type,
                                int x,
                                int y,
                                const GURL& link_url,
                                const GURL& image_url,
                                const GURL& page_url,
                                const GURL& frame_url,
                                const ContextMenuMediaParams& media_params,
                                const std::wstring& selection_text,
                                const std::wstring& misspelled_word,
                                int edit_flags,
                                const std::string& security_info,
                                const std::string& frame_charset);
-  virtual void DidCreateDataSource(WebFrame* frame,
+  virtual void DidCreateDataSource(WebKit::WebFrame* frame,
                                    WebKit::WebDataSource* ds);
   virtual void DidStartProvisionalLoadForFrame(
     WebView* webview,
-    WebFrame* frame,
+    WebKit::WebFrame* frame,
     NavigationGesture gesture);
   virtual void DidReceiveProvisionalLoadServerRedirect(
-    WebView* webview, WebFrame* frame);
+    WebView* webview, WebKit::WebFrame* frame);
   virtual void DidFailProvisionalLoadWithError(
       WebView* webview,
       const WebKit::WebURLError& error,
-      WebFrame* frame);
-  virtual void DidCommitLoadForFrame(WebView* webview, WebFrame* frame,
-                                     bool is_new_navigation);
+      WebKit::WebFrame* frame);
+  virtual void DidCommitLoadForFrame(
+      WebView* webview,
+      WebKit::WebFrame* frame,
+      bool is_new_navigation);
   virtual void DidReceiveTitle(WebView* webview,
                                const std::wstring& title,
-                               WebFrame* frame);
+                               WebKit::WebFrame* frame);
   virtual void DidFinishDocumentLoadForFrame(WebView* webview,
-                                             WebFrame* frame);
+                                             WebKit::WebFrame* frame);
   virtual void DidHandleOnloadEventsForFrame(WebView* webview,
-                                             WebFrame* frame);
+                                             WebKit::WebFrame* frame);
   virtual void DidChangeLocationWithinPageForFrame(WebView* webview,
-                                                   WebFrame* frame,
+                                                   WebKit::WebFrame* frame,
                                                    bool is_new_navigation);
-  virtual void DidReceiveIconForFrame(WebView* webview, WebFrame* frame);
+  virtual void DidReceiveIconForFrame(WebView* webview, WebKit::WebFrame* frame);
 
   virtual void WillPerformClientRedirect(WebView* webview,
-                                         WebFrame* frame,
+                                         WebKit::WebFrame* frame,
                                          const GURL& src_url,
                                          const GURL& dest_url,
                                          unsigned int delay_seconds,
                                          unsigned int fire_date);
   virtual void DidCancelClientRedirect(WebView* webview,
-                                       WebFrame* frame);
+                                       WebKit::WebFrame* frame);
 
-  virtual void DidFinishLoadForFrame(WebView* webview, WebFrame* frame);
+  virtual void DidFinishLoadForFrame(WebView* webview, WebKit::WebFrame* frame);
   virtual void DidFailLoadWithError(WebView* webview,
                                     const WebKit::WebURLError& error,
-                                    WebFrame* for_frame);
+                                    WebKit::WebFrame* for_frame);
 
-  virtual void AssignIdentifierToRequest(WebFrame* webframe,
+  virtual void AssignIdentifierToRequest(WebKit::WebFrame* webframe,
                                          uint32 identifier,
                                          const WebKit::WebURLRequest& request);
-  virtual void WillSendRequest(WebFrame* webframe,
+  virtual void WillSendRequest(WebKit::WebFrame* webframe,
                                uint32 identifier,
                                WebKit::WebURLRequest* request,
                                const WebKit::WebURLResponse& redirect_response);
-  virtual void DidReceiveResponse(WebFrame* webframe,
+  virtual void DidReceiveResponse(WebKit::WebFrame* webframe,
                                   uint32 identifier,
                                   const WebKit::WebURLResponse& response);
-  virtual void DidFinishLoading(WebFrame* webframe, uint32 identifier);
-  virtual void DidFailLoadingWithError(WebFrame* webframe,
+  virtual void DidFinishLoading(WebKit::WebFrame* webframe, uint32 identifier);
+  virtual void DidFailLoadingWithError(WebKit::WebFrame* webframe,
                                        uint32 identifier,
                                        const WebKit::WebURLError& error);
 
   virtual bool ShouldBeginEditing(WebView* webview, std::wstring range);
   virtual bool ShouldEndEditing(WebView* webview, std::wstring range);
   virtual bool ShouldInsertNode(WebView* webview,
                                 std::wstring node,
                                 std::wstring range,
                                 std::wstring action);
   virtual bool ShouldInsertText(WebView* webview,
@@ skipping 12 matching lines @@
   virtual bool SmartInsertDeleteEnabled();
   virtual bool IsSelectTrailingWhitespaceEnabled();
   virtual void DidBeginEditing();
   virtual void DidChangeSelection(bool is_empty_selection);
   virtual void DidChangeContents();
   virtual void DidEndEditing();
 
   virtual void DidStartLoading(WebView* webview);
   virtual void DidStopLoading(WebView* webview);
 
-  virtual void WindowObjectCleared(WebFrame* webframe);
+  virtual void WindowObjectCleared(WebKit::WebFrame* webframe);
   virtual WebKit::WebNavigationPolicy PolicyForNavigationAction(
     WebView* webview,
-    WebFrame* frame,
+    WebKit::WebFrame* frame,
     const WebKit::WebURLRequest& request,
     WebKit::WebNavigationType type,
     WebKit::WebNavigationPolicy default_policy,
     bool is_redirect);
   virtual void NavigateBackForwardSoon(int offset);
   virtual int GetHistoryBackListCount();
   virtual int GetHistoryForwardListCount();
 
   // WebWidgetClient
   virtual void didInvalidateRect(const WebKit::WebRect& rect);
   virtual void didScrollRect(int dx, int dy,
                              const WebKit::WebRect& clip_rect);
   virtual void didFocus();
   virtual void didBlur();
   virtual void didChangeCursor(const WebKit::WebCursorInfo& cursor);
   virtual void closeWidgetSoon();
   virtual void show(WebKit::WebNavigationPolicy policy);
   virtual void runModal();
   virtual WebKit::WebRect windowRect();
   virtual void setWindowRect(const WebKit::WebRect& rect);
   virtual WebKit::WebRect rootWindowRect();
   virtual WebKit::WebRect windowResizerRect();
   virtual WebKit::WebScreenInfo screenInfo();
 
   void SetSmartInsertDeleteEnabled(bool enabled);
   void SetSelectTrailingWhitespaceEnabled(bool enabled);
 
   // Additional accessors
-  WebFrame* top_loading_frame() { return top_loading_frame_; }
+  WebKit::WebFrame* top_loading_frame() { return top_loading_frame_; }
 #if defined(OS_WIN)
   IDropTarget* drop_delegate() { return drop_delegate_.get(); }
   IDropSource* drag_delegate() { return drag_delegate_.get(); }
 #endif
   const CapturedContextMenuEvents& captured_context_menu_events() const {
     return captured_context_menu_events_;
   }
   void clear_captured_context_menu_events() {
     captured_context_menu_events_.clear();
   }
@@ skipping 33 matching lines @@
   void SetAddressBarURL(const GURL& url);
 
   // Show a JavaScript alert as a popup message.
   // The caller should test whether we're in layout test mode and only
   // call this function when we really want a message to pop up.
   void ShowJavaScriptAlert(const std::wstring& message);
 
   // In the Mac code, this is called to trigger the end of a test after the
   // page has finished loading.  From here, we can generate the dump for the
   // test.
-  void LocationChangeDone(WebFrame*);
+  void LocationChangeDone(WebKit::WebFrame*);
 
   WebWidgetHost* GetWidgetHost();
 
-  void UpdateForCommittedLoad(WebFrame* webframe, bool is_new_navigation);
-  void UpdateURL(WebFrame* frame);
-  void UpdateSessionHistory(WebFrame* frame);
+  void UpdateForCommittedLoad(WebKit::WebFrame* webframe, bool is_new_navigation);
+  void UpdateURL(WebKit::WebFrame* frame);
+  void UpdateSessionHistory(WebKit::WebFrame* frame);
   void UpdateSelectionClipboard(bool is_empty_selection);
 
   // Get a string suitable for dumping a frame to the console.
-  std::wstring GetFrameDescription(WebFrame* webframe);
+  std::wstring GetFrameDescription(WebKit::WebFrame* webframe);
 
  private:
   // Causes navigation actions just printout the intended navigation instead
   // of taking you to the page. This is used for cases like mailto, where you
   // don't actually want to open the mail program.
   bool policy_delegate_enabled_;
 
   // Toggles the behavior of the policy delegate.  If true, then navigations
   // will be allowed.  Otherwise, they will be ignored (dropped).
   bool policy_delegate_is_permissive_;
 
   // If true, the policy delegate will signal layout test completion.
   bool policy_delegate_should_notify_done_;
 
   // Non-owning pointer.  The delegate is owned by the host.
   TestShell* shell_;
 
   // This is non-NULL IFF a load is in progress.
-  WebFrame* top_loading_frame_;
+  WebKit::WebFrame* top_loading_frame_;
 
   // For tracking session history.  See RenderView.
   int page_id_;
   int last_page_id_updated_;
 
   scoped_ptr<TestShellExtraData> pending_extra_data_;
 
   // Maps resource identifiers to a descriptive string.
   typedef std::map<uint32, std::string> ResourceMap;
   ResourceMap resource_identifier_map_;
@@ skipping 27 matching lines @@
   // true if we want to enable selection of trailing whitespaces
   bool select_trailing_whitespace_enabled_;
 
   // true if we should block any redirects
   bool block_redirects_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWebViewDelegate);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_