From a87eaa8bae1308e2fc386cb57dff057bb71d4fff Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Mon, 26 Oct 2009 16:28:06 +0000 Subject: Minor cleanup in glue to remove some remaining base dependencies. Also moves the guts of WebFrameImpl::GetWebViewImpl to WebViewImpl's FromPage method since it involves dipping into ChromeClientImpl. R=dglazkov BUG=none TEST=none Review URL: http://codereview.chromium.org/339001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30052 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webview_impl.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'webkit/glue/webview_impl.cc') diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 7992909..3d34955 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -68,7 +68,6 @@ #include "webkit/api/src/DOMUtilitiesPrivate.h" #include "webkit/api/src/WebInputEventConversion.h" #include "webkit/api/src/WebSettingsImpl.h" -#include "webkit/glue/glue_serialize.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webdevtoolsagent_impl.h" #include "webkit/glue/webkit_glue.h" @@ -942,7 +941,10 @@ Frame* WebViewImpl::GetFocusedWebCoreFrame() { // static WebViewImpl* WebViewImpl::FromPage(WebCore::Page* page) { - return WebFrameImpl::FromFrame(page->mainFrame())->GetWebViewImpl(); + if (!page) + return NULL; + + return static_cast(page->chrome()->client())->webview(); } // WebWidget ------------------------------------------------------------------ -- cgit v1.1