Switch to WebFrame from the WebKit API....

webkit/glue/webview_impl.h

 // Copyright (c) 2009 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.
 
 #ifndef WEBKIT_GLUE_WEBVIEW_IMPL_H_
 #define WEBKIT_GLUE_WEBVIEW_IMPL_H_
 
 #include <set>
 
 #include "Page.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/glue/back_forward_list_client_impl.h"
-#include "webkit/glue/image_resource_fetcher.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 
 namespace WebCore {
 class ChromiumDataObject;
 class Frame;
 class HistoryItem;
 class HitTestResult;
 class KeyboardEvent;
 class Page;
 class PlatformKeyboardEvent;
 class PopupContainer;
 class Range;
 class RenderTheme;
 class Widget;
 }
 
 namespace WebKit {
 class WebKeyboardEvent;
 class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebSettingsImpl;
 }
 
+namespace webkit_glue {
+class ImageResourceFetcher;
+}
+
 class AutocompletePopupMenuClient;
 class SearchableFormData;
 class WebHistoryItemImpl;
 class WebDevToolsAgent;
 class WebDevToolsAgentImpl;
 class WebViewDelegate;
 
 class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> {
  public:
   // WebWidget methods:
@@ skipping 15 matching lines @@
                                       WebKit::WebRect* caret_rect);
   virtual void setTextDirection(WebKit::WebTextDirection direction);
 
   // WebView methods:
   virtual bool ShouldClose();
   virtual void ClosePage();
   virtual WebViewDelegate* GetDelegate();
   virtual void SetDelegate(WebViewDelegate*);
   virtual void SetUseEditorDelegate(bool value);
   virtual void SetTabKeyCyclesThroughElements(bool value);
-  virtual WebFrame* GetMainFrame();
-  virtual WebFrame* GetFocusedFrame();
-  virtual void SetFocusedFrame(WebFrame* frame);
-  virtual WebFrame* GetFrameWithName(const std::wstring& name);
-  virtual WebFrame* GetPreviousFrameBefore(WebFrame* frame, bool wrap);
-  virtual WebFrame* GetNextFrameAfter(WebFrame* frame, bool wrap);
+  virtual WebKit::WebFrame* GetMainFrame();
+  virtual WebKit::WebFrame* GetFocusedFrame();
+  virtual void SetFocusedFrame(WebKit::WebFrame* frame);
+  virtual WebKit::WebFrame* GetFrameWithName(const std::wstring& name);
+  virtual WebKit::WebFrame* GetPreviousFrameBefore(WebKit::WebFrame* frame, bool wrap);
+  virtual WebKit::WebFrame* GetNextFrameAfter(WebKit::WebFrame* frame, bool wrap);
   virtual void ClearFocusedNode();
   virtual void StopLoading();
   virtual void SetBackForwardListSize(int size);
   virtual void SetInitialFocus(bool reverse);
   virtual bool DownloadImage(int id, const GURL& image_url, int image_size);
   virtual void SetPreferences(const WebPreferences& preferences);
   virtual const WebPreferences& GetPreferences();
   virtual WebKit::WebSettings* GetSettings();
   virtual void SetPageEncoding(const std::wstring& encoding_name);
   virtual std::wstring GetMainFrameEncodingName();
@@ skipping 272 matching lines @@
   static const WebKit::WebInputEvent* current_input_event() {
     return g_current_input_event;
   }
 private:
   static const WebKit::WebInputEvent* g_current_input_event;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBVIEW_IMPL_H_