Delete glue/webview{_delegate}.h

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 <string>
 #include <vector>
 
 #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/api/public/WebString.h"
+#include "webkit/api/public/WebView.h"
 #include "webkit/api/src/NotificationPresenterImpl.h"
 #include "webkit/glue/back_forward_list_client_impl.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/context_menu_client_impl.h"
 #include "webkit/glue/dragclient_impl.h"
 #include "webkit/glue/editor_client_impl.h"
 #include "webkit/glue/inspector_client_impl.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;
@@ skipping 11 matching lines @@
 }
 
 namespace webkit_glue {
 class ImageResourceFetcher;
 }
 
 class AutocompletePopupMenuClient;
 class SearchableFormData;
 class WebHistoryItemImpl;
 class WebDevToolsAgentImpl;
-class WebViewDelegate;
 
-class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> {
+class WebViewImpl : public WebKit::WebView,
+                    public base::RefCounted<WebViewImpl> {
  public:
   // WebWidget methods:
   virtual void close();
   virtual WebKit::WebSize size() { return size_; }
   virtual void resize(const WebKit::WebSize& new_size);
   virtual void layout();
   virtual void paint(WebKit::WebCanvas* canvas,
                      const WebKit::WebRect& rect);
   virtual bool handleInputEvent(const WebKit::WebInputEvent& input_event);
   virtual void mouseCaptureLost();
@@ skipping 63 matching lines @@
   virtual WebKit::WebString inspectorSettings() const;
   virtual void setInspectorSettings(const WebKit::WebString& settings);
   virtual WebKit::WebDevToolsAgent* devToolsAgent();
   virtual WebKit::WebAccessibilityObject accessibilityObject();
   virtual void applyAutofillSuggestions(
       const WebKit::WebNode&,
       const WebKit::WebVector<WebKit::WebString>& suggestions,
       int defaultSuggestionIndex);
   virtual void hideAutofillPopup();
 
-  // WebView methods:
-  virtual void SetIgnoreInputEvents(bool new_value);
+  // WebViewImpl
+
+  void SetIgnoreInputEvents(bool new_value);
   WebDevToolsAgentImpl* GetWebDevToolsAgentImpl();
 
-  // WebViewImpl
-
   const WebKit::WebPoint& last_mouse_down_point() const {
       return last_mouse_down_point_;
   }
 
   WebCore::Frame* GetFocusedWebCoreFrame();
 
   // Returns the currently focused Node or NULL if no node has focus.
   WebCore::Node* GetFocusedNode();
 
   static WebViewImpl* FromPage(WebCore::Page* page);
 
   WebKit::WebViewClient* client() {
-    return delegate_;
-  }
-
-  // TODO(darin): Remove this method in favor of client().
-  WebViewDelegate* delegate() {
-    return delegate_;
+    return client_;
   }
 
   // Returns the page object associated with this view.  This may be NULL when
   // the page is shutting down, but will be valid at all other times.
   WebCore::Page* page() const {
     return page_.get();
   }
 
   WebCore::RenderTheme* theme() const;
 
@@ skipping 69 matching lines @@
   // Returns the provider of desktop notifications.
   WebKit::NotificationPresenterImpl* GetNotificationPresenter();
 #endif
 
   // Tries to scroll a frame or any parent of a frame. Returns true if the view
   // was scrolled.
   bool PropagateScroll(WebCore::ScrollDirection scroll_direction,
                        WebCore::ScrollGranularity scroll_granularity);
 
  protected:
-  friend class WebView;  // So WebView::Create can call our constructor
+  friend class WebKit::WebView;  // So WebView::Create can call our constructor
   friend class base::RefCounted<WebViewImpl>;
 
-  WebViewImpl(WebViewDelegate* delegate);
+  WebViewImpl(WebKit::WebViewClient* client);
   ~WebViewImpl();
 
   void ModifySelection(uint32 message,
                        WebCore::Frame* frame,
                        const WebCore::PlatformKeyboardEvent& e);
 
-  WebViewDelegate* delegate_;
+  WebKit::WebViewClient* client_;
 
   webkit_glue::BackForwardListClientImpl back_forward_list_client_impl_;
   ChromeClientImpl chrome_client_impl_;
   ContextMenuClientImpl context_menu_client_impl_;
   DragClientImpl drag_client_impl_;
   EditorClientImpl editor_client_impl_;
   InspectorClientImpl inspector_client_impl_;
 
   WebKit::WebSize size_;
 
   WebKit::WebPoint last_mouse_position_;
   scoped_ptr<WebCore::Page> page_;
 
   // This flag is set when a new navigation is detected.  It is used to satisfy
-  // the corresponding argument to WebViewDelegate::DidCommitLoadForFrame.
+  // the corresponding argument to WebFrameClient::didCommitProvisionalLoad.
   bool observed_new_navigation_;
 #ifndef NDEBUG
   // Used to assert that the new navigation we observed is the same navigation
   // when we make use of observed_new_navigation_.
   const WebCore::DocumentLoader* new_navigation_loader_;
 #endif
 
   // A copy of the WebPreferences object we receive from the browser.
   WebPreferences webprefs_;
 
@@ skipping 113 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_