Minor cleanup in glue to remove some remaining base dependencies....

webkit/glue/webview_impl.cc

 // Copyright (c) 2007-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.
 
 #include "config.h"
 
 #include "AXObjectCache.h"
 #include "CSSStyleSelector.h"
 #include "CSSValueKeywords.h"
 #include "Cursor.h"
@@ skipping 50 matching lines @@
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/WebMediaPlayerAction.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebVector.h"
 #include "webkit/api/public/WebViewClient.h"
 #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"
 #include "webkit/glue/webpopupmenu_impl.h"
 #include "webkit/glue/webview_impl.h"
 
 // Get rid of WTF's pow define so we can use std::pow.
 #undef pow
 #include <cmath> // for std::pow
 
@@ skipping 853 matching lines @@
   }
   return scroll_handled;
 }
 
 Frame* WebViewImpl::GetFocusedWebCoreFrame() {
   return page_.get() ? page_->focusController()->focusedOrMainFrame() : NULL;
 }
 
 // static
 WebViewImpl* WebViewImpl::FromPage(WebCore::Page* page) {
-  return WebFrameImpl::FromFrame(page->mainFrame())->GetWebViewImpl();
+  if (!page)
+    return NULL;
+
+  return static_cast<ChromeClientImpl*>(page->chrome()->client())->webview();
 }
 
 // WebWidget ------------------------------------------------------------------
 
 void WebViewImpl::close() {
   RefPtr<WebFrameImpl> main_frame;
 
   if (page_.get()) {
     // Initiate shutdown for the entire frameset.  This will cause a lot of
     // notifications to be sent.
@@ skipping 955 matching lines @@
       hitTestResultAtPoint(doc_point, false);
 }
 
 void WebViewImpl::setTabsToLinks(bool enable) {
   tabs_to_links_ = enable;
 }
 
 bool WebViewImpl::tabsToLinks() const {
   return tabs_to_links_;
 }