diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 05:11:03 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 05:11:03 +0000 |
commit | 50ae00ef9da3304a68d9f811380572a5e2ed03cb (patch) | |
tree | e58480c200f54468e61635a134cb6b51fb7809df /webkit/tools | |
parent | a9e8a092db75a1aff5e03d29215390ade65dec1e (diff) | |
download | chromium_src-50ae00ef9da3304a68d9f811380572a5e2ed03cb.zip chromium_src-50ae00ef9da3304a68d9f811380572a5e2ed03cb.tar.gz chromium_src-50ae00ef9da3304a68d9f811380572a5e2ed03cb.tar.bz2 |
Delete glue/webview{_delegate}.h
R=dglazkov
BUG=10033
TEST=none
Review URL: http://codereview.chromium.org/293001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
24 files changed, 53 insertions, 35 deletions
diff --git a/webkit/tools/test_shell/drag_delegate.cc b/webkit/tools/test_shell/drag_delegate.cc index 0fc97a3..f0247ca 100644 --- a/webkit/tools/test_shell/drag_delegate.cc +++ b/webkit/tools/test_shell/drag_delegate.cc @@ -5,9 +5,10 @@ #include "webkit/tools/test_shell/drag_delegate.h" #include "webkit/api/public/WebPoint.h" -#include "webkit/glue/webview.h" +#include "webkit/api/public/WebView.h" using WebKit::WebPoint; +using WebKit::WebView; namespace { diff --git a/webkit/tools/test_shell/drag_delegate.h b/webkit/tools/test_shell/drag_delegate.h index 0b33487..1fde8e4 100644 --- a/webkit/tools/test_shell/drag_delegate.h +++ b/webkit/tools/test_shell/drag_delegate.h @@ -9,11 +9,13 @@ #include "base/base_drag_source.h" +namespace WebKit { class WebView; +} class TestDragDelegate : public BaseDragSource { public: - TestDragDelegate(HWND source_hwnd, WebView* webview) + TestDragDelegate(HWND source_hwnd, WebKit::WebView* webview) : BaseDragSource(), source_hwnd_(source_hwnd), webview_(webview) { } @@ -25,7 +27,7 @@ class TestDragDelegate : public BaseDragSource { virtual void OnDragSourceMove(); private: - WebView* webview_; + WebKit::WebView* webview_; // A HWND for the source we are associated with, used for translating // mouse coordinates from screen to client coordinates. diff --git a/webkit/tools/test_shell/drop_delegate.cc b/webkit/tools/test_shell/drop_delegate.cc index d7d3934..0ef7ae6 100644 --- a/webkit/tools/test_shell/drop_delegate.cc +++ b/webkit/tools/test_shell/drop_delegate.cc @@ -6,12 +6,13 @@ #include "webkit/api/public/WebDragData.h" #include "webkit/api/public/WebPoint.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/webdropdata.h" -#include "webkit/glue/webview.h" using WebKit::WebDragOperation; using WebKit::WebDragOperationCopy; using WebKit::WebPoint; +using WebKit::WebView; // BaseDropTarget methods ---------------------------------------------------- diff --git a/webkit/tools/test_shell/drop_delegate.h b/webkit/tools/test_shell/drop_delegate.h index 7064607..8a1442a 100644 --- a/webkit/tools/test_shell/drop_delegate.h +++ b/webkit/tools/test_shell/drop_delegate.h @@ -9,11 +9,13 @@ #include "base/base_drop_target.h" +namespace WebKit { class WebView; +} class TestDropDelegate : public BaseDropTarget { public: - TestDropDelegate(HWND source_hwnd, WebView* webview) + TestDropDelegate(HWND source_hwnd, WebKit::WebView* webview) : BaseDropTarget(source_hwnd), webview_(webview) { } @@ -35,7 +37,7 @@ class TestDropDelegate : public BaseDropTarget { private: - WebView* webview_; + WebKit::WebView* webview_; }; #endif // WEBKIT_TOOLS_TEST_SHELL_DROP_DELEGATE_H__ diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc index 87034ca..3a024d8 100644 --- a/webkit/tools/test_shell/event_sending_controller.cc +++ b/webkit/tools/test_shell/event_sending_controller.cc @@ -36,8 +36,8 @@ #include "webkit/api/public/WebDragOperation.h" #include "webkit/api/public/WebPoint.h" #include "webkit/api/public/WebString.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/webview.h" #include "webkit/tools/test_shell/test_shell.h" #if defined(OS_WIN) @@ -58,6 +58,7 @@ using WebKit::WebKeyboardEvent; using WebKit::WebMouseEvent; using WebKit::WebPoint; using WebKit::WebString; +using WebKit::WebView; TestShell* EventSendingController::shell_ = NULL; gfx::Point EventSendingController::last_mouse_pos_; diff --git a/webkit/tools/test_shell/event_sending_controller.h b/webkit/tools/test_shell/event_sending_controller.h index ba2a3b2..3593ff6a 100644 --- a/webkit/tools/test_shell/event_sending_controller.h +++ b/webkit/tools/test_shell/event_sending_controller.h @@ -24,10 +24,10 @@ #include "webkit/glue/cpp_bound_class.h" class TestShell; -class WebView; namespace WebKit { class WebDragData; +class WebView; struct WebPoint; } @@ -81,7 +81,7 @@ class EventSendingController : public CppBoundClass { private: // Returns the test shell's webview. - static WebView* webview(); + static WebKit::WebView* webview(); // Returns true if dragMode is true. bool drag_mode() { return dragMode.isBool() && dragMode.ToBoolean(); } diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index d757d8b..cac9065 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -19,9 +19,9 @@ #include "webkit/api/public/WebKit.h" #include "webkit/api/public/WebScriptSource.h" #include "webkit/api/public/WebURL.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/webview.h" #include "webkit/tools/test_shell/simple_database_system.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "webkit/tools/test_shell/test_navigation_controller.h" diff --git a/webkit/tools/test_shell/mac/test_shell_webview.mm b/webkit/tools/test_shell/mac/test_shell_webview.mm index 251e8b6..ed9b84e 100644 --- a/webkit/tools/test_shell/mac/test_shell_webview.mm +++ b/webkit/tools/test_shell/mac/test_shell_webview.mm @@ -10,7 +10,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "webkit/api/public/WebFrame.h" -#include "webkit/glue/webview.h" +#include "webkit/api/public/WebView.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/webwidget_host.h" diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm index 3d298b9..186c3fd 100644 --- a/webkit/tools/test_shell/mac/test_webview_delegate.mm +++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm @@ -9,8 +9,8 @@ #include "base/sys_string_conversions.h" #include "webkit/api/public/WebCursorInfo.h" #include "webkit/api/public/WebPopupMenu.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/webcursor.h" -#include "webkit/glue/webview.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webmenurunner_mac.h" diff --git a/webkit/tools/test_shell/mac/webview_host.mm b/webkit/tools/test_shell/mac/webview_host.mm index 9f267a9..3e13f76 100644 --- a/webkit/tools/test_shell/mac/webview_host.mm +++ b/webkit/tools/test_shell/mac/webview_host.mm @@ -11,11 +11,12 @@ #include "base/gfx/size.h" #include "skia/ext/platform_canvas.h" #include "webkit/api/public/WebSize.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/webview.h" #include "webkit/tools/test_shell/test_webview_delegate.h" using WebKit::WebSize; +using WebKit::WebView; // static WebViewHost* WebViewHost::Create(NSView* parent_view, @@ -35,7 +36,7 @@ WebViewHost* WebViewHost::Create(NSView* parent_view, [parent_view addSubview:host->view_]; [host->view_ release]; - host->webwidget_ = WebView::Create(delegate); + host->webwidget_ = WebView::create(delegate); prefs.Apply(host->webview()); host->webview()->initializeMainFrame(delegate); host->webwidget_->resize(WebSize(content_rect.size.width, diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index 7f7214e..7b374fd 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -14,7 +14,7 @@ #include "webkit/api/public/WebFrame.h" #include "webkit/api/public/WebInputEvent.h" #include "webkit/api/public/WebScriptSource.h" -#include "webkit/glue/webview.h" +#include "webkit/api/public/WebView.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/test_shell_test.h" diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index e6dad8a..97c2eba 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -41,10 +41,10 @@ #include "webkit/api/public/WebURL.h" #include "webkit/api/public/WebURLRequest.h" #include "webkit/api/public/WebURLResponse.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/glue_serialize.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/webview.h" #include "webkit/tools/test_shell/accessibility_controller.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "webkit/tools/test_shell/test_navigation_controller.h" @@ -56,6 +56,7 @@ using WebKit::WebNavigationPolicy; using WebKit::WebRect; using WebKit::WebSize; using WebKit::WebURLRequest; +using WebKit::WebView; namespace { diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h index d50aa80..9ff142b 100644 --- a/webkit/tools/test_shell/test_shell.h +++ b/webkit/tools/test_shell/test_shell.h @@ -94,7 +94,7 @@ public: // cleanup. void PlatformCleanUp(); - WebView* webView() { + WebKit::WebView* webView() { return m_webViewHost.get() ? m_webViewHost->webview() : NULL; } WebViewHost* webViewHost() { return m_webViewHost.get(); } @@ -186,7 +186,7 @@ public: // Implements CreateWebView for TestWebViewDelegate, which in turn // is called as a WebViewDelegate. - WebView* CreateWebView(); + WebKit::WebView* CreateWebView(); WebKit::WebWidget* CreatePopupWidget(); void ClosePopup(); diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index 9b50e24..433f191 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -25,11 +25,11 @@ #include "net/base/net_util.h" #include "webkit/api/public/WebFrame.h" #include "webkit/api/public/WebPoint.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/webview.h" #include "webkit/tools/test_shell/test_navigation_controller.h" #include "webkit/tools/test_shell/test_webview_delegate.h" diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index d67eb38..9acf823 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -29,9 +29,9 @@ #include "skia/ext/bitmap_platform_device.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/api/public/WebFrame.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/webview.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/tools/test_shell/mac/test_shell_webview.h" #include "webkit/tools/test_shell/resource.h" diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index f2e518a..80344b7 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -28,9 +28,9 @@ #include "net/url_request/url_request_file_job.h" #include "skia/ext/bitmap_platform_device.h" #include "webkit/api/public/WebFrame.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/webview.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/tools/test_shell/resource.h" #include "webkit/tools/test_shell/test_navigation_controller.h" diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 43922d6..b90ce12 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -40,6 +40,7 @@ #include "webkit/api/public/WebURLError.h" #include "webkit/api/public/WebURLRequest.h" #include "webkit/api/public/WebURLResponse.h" +#include "webkit/api/public/WebView.h" #include "webkit/appcache/appcache_interfaces.h" #include "webkit/glue/glue_serialize.h" #include "webkit/glue/glue_util.h" @@ -50,7 +51,6 @@ #include "webkit/glue/webplugin_impl.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/webview.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webmediaplayer_impl.h" @@ -101,6 +101,7 @@ using WebKit::WebURLResponse; using WebKit::WebWidget; using WebKit::WebWorker; using WebKit::WebWorkerClient; +using WebKit::WebView; using webkit_glue::AccessibilityObjectToWebAccessibilityObject; diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index 155bb64..f5a5632 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -30,9 +30,9 @@ #if defined(OS_MACOSX) #include "webkit/api/public/WebPopupMenuInfo.h" #endif +#include "webkit/api/public/WebViewClient.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webplugin_page_delegate.h" -#include "webkit/glue/webview_delegate.h" #if defined(OS_WIN) #include "webkit/tools/test_shell/drag_delegate.h" #include "webkit/tools/test_shell/drop_delegate.h" @@ -44,7 +44,7 @@ class GURL; class TestShell; class WebWidgetHost; -class TestWebViewDelegate : public WebViewDelegate, +class TestWebViewDelegate : public WebKit::WebViewClient, public WebKit::WebFrameClient, public webkit_glue::WebPluginPageDelegate, public base::SupportsWeakPtr<TestWebViewDelegate> { @@ -66,7 +66,7 @@ class TestWebViewDelegate : public WebViewDelegate, typedef std::vector<CapturedContextMenuEvent> CapturedContextMenuEvents; // WebKit::WebViewClient - virtual WebView* createView(WebKit::WebFrame* creator); + virtual WebKit::WebView* createView(WebKit::WebFrame* creator); virtual WebKit::WebWidget* createPopupMenu(bool activatable); virtual WebKit::WebWidget* createPopupMenu( const WebKit::WebPopupMenuInfo& info); @@ -316,7 +316,7 @@ class TestWebViewDelegate : public WebViewDelegate, // Called when the URL of the page changes. // Extracts the URL and forwards on to SetAddressBarURL(). - void UpdateAddressBar(WebView* webView); + void UpdateAddressBar(WebKit::WebView* webView); // Called when the URL of the page changes. // Should be used to update the text of the URL bar. diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc index 728c5ad..288ca24 100644 --- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc +++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc @@ -20,12 +20,12 @@ #include "webkit/api/public/WebFrame.h" #include "webkit/api/public/WebRect.h" #include "webkit/api/public/WebString.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/webplugin.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/webview.h" #include "webkit/glue/plugins/gtk_plugin_container_manager.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/window_open_disposition.h" @@ -39,6 +39,7 @@ using WebKit::WebNavigationPolicy; using WebKit::WebPopupMenuInfo; using WebKit::WebRect; using WebKit::WebWidget; +using WebKit::WebView; namespace { diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc index 8d0f291..180e5f9 100644 --- a/webkit/tools/test_shell/test_webview_delegate_win.cc +++ b/webkit/tools/test_shell/test_webview_delegate_win.cc @@ -22,11 +22,11 @@ #include "webkit/api/public/WebCursorInfo.h" #include "webkit/api/public/WebFrame.h" #include "webkit/api/public/WebRect.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/webplugin.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/webview.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/window_open_disposition.h" diff --git a/webkit/tools/test_shell/text_input_controller.cc b/webkit/tools/test_shell/text_input_controller.cc index 529fb61..0bc873e 100644 --- a/webkit/tools/test_shell/text_input_controller.cc +++ b/webkit/tools/test_shell/text_input_controller.cc @@ -8,7 +8,7 @@ #include "webkit/api/public/WebFrame.h" #include "webkit/api/public/WebRange.h" #include "webkit/api/public/WebString.h" -#include "webkit/glue/webview.h" +#include "webkit/api/public/WebView.h" #include "webkit/tools/test_shell/test_shell.h" using WebKit::WebFrame; diff --git a/webkit/tools/test_shell/webview_host.h b/webkit/tools/test_shell/webview_host.h index ebc7ab9..9ac1fc6 100644 --- a/webkit/tools/test_shell/webview_host.h +++ b/webkit/tools/test_shell/webview_host.h @@ -16,9 +16,12 @@ #endif struct WebPreferences; -class WebView; class TestWebViewDelegate; +namespace WebKit { +class WebView; +} + // This class is a simple NativeView-based host for a WebView class WebViewHost : public WebWidgetHost { public: @@ -29,7 +32,7 @@ class WebViewHost : public WebWidgetHost { TestWebViewDelegate* delegate, const WebPreferences& prefs); - WebView* webview() const; + WebKit::WebView* webview() const; #if defined(OS_LINUX) // Create a new plugin parent container for a given plugin XID. diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc index 88f5a91..dd2e593 100644 --- a/webkit/tools/test_shell/webview_host_gtk.cc +++ b/webkit/tools/test_shell/webview_host_gtk.cc @@ -10,11 +10,13 @@ #include "base/gfx/rect.h" #include "base/gfx/size.h" #include "skia/ext/platform_canvas.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/plugins/gtk_plugin_container.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/webview.h" #include "webkit/tools/test_shell/test_webview_delegate.h" +using WebKit::WebView; + // static WebViewHost* WebViewHost::Create(GtkWidget* parent_view, TestWebViewDelegate* delegate, @@ -24,7 +26,7 @@ WebViewHost* WebViewHost::Create(GtkWidget* parent_view, host->view_ = WebWidgetHost::CreateWidget(parent_view, host); host->plugin_container_manager_.set_host_widget(host->view_); - host->webwidget_ = WebView::Create(delegate); + host->webwidget_ = WebView::create(delegate); prefs.Apply(host->webview()); host->webview()->initializeMainFrame(delegate); host->webwidget_->layout(); diff --git a/webkit/tools/test_shell/webview_host_win.cc b/webkit/tools/test_shell/webview_host_win.cc index 81ee86e..abbe53f 100644 --- a/webkit/tools/test_shell/webview_host_win.cc +++ b/webkit/tools/test_shell/webview_host_win.cc @@ -8,10 +8,12 @@ #include "base/gfx/size.h" #include "base/win_util.h" #include "skia/ext/platform_canvas.h" +#include "webkit/api/public/WebView.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/webview.h" #include "webkit/tools/test_shell/test_webview_delegate.h" +using namespace WebKit; + static const wchar_t kWindowClassName[] = L"WebViewHost"; /*static*/ @@ -39,7 +41,7 @@ WebViewHost* WebViewHost::Create(HWND parent_view, GetModuleHandle(NULL), NULL); win_util::SetWindowUserData(host->view_, host); - host->webwidget_ = WebView::Create(delegate); + host->webwidget_ = WebView::create(delegate); prefs.Apply(host->webview()); host->webview()->initializeMainFrame(delegate); |