Moves webview_impl.cc, webframe_impl.cc and webframeloaderclient_impl.cc into...

webkit/glue/webkitclient_impl.cc

 // 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.
 
 #include <math.h>
 #include "config.h"
 
 #include "FrameView.h"
 #include "ScrollView.h"
 #include <wtf/Assertions.h>
@@ skipping 15 matching lines @@
 #include "webkit/api/public/WebCursorInfo.h"
 #include "webkit/api/public/WebData.h"
 #include "webkit/api/public/WebFrameClient.h"
 #include "webkit/api/public/WebPluginListBuilder.h"
 #include "webkit/api/public/WebScreenInfo.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebVector.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebViewClient.h"
 #include "webkit/api/src/ChromeClientImpl.h"
+#include "webkit/api/src/WebFrameImpl.h"
+#include "webkit/api/src/WebViewImpl.h"
 #include "webkit/api/src/WebWorkerClientImpl.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugininfo.h"
 #include "webkit/glue/websocketstreamhandle_impl.h"
 #include "webkit/glue/weburlloader_impl.h"
-#include "webkit/glue/webview_impl.h"
 
 using WebKit::ChromeClientImpl;
 using WebKit::WebApplicationCacheHost;
 using WebKit::WebApplicationCacheHostClient;
 using WebKit::WebCookie;
 using WebKit::WebCursorInfo;
 using WebKit::WebData;
+using WebKit::WebFrameImpl;
 using WebKit::WebLocalizedString;
 using WebKit::WebPluginListBuilder;
 using WebKit::WebStorageNamespace;
 using WebKit::WebString;
 using WebKit::WebSocketStreamHandle;
 using WebKit::WebThemeEngine;
 using WebKit::WebURL;
 using WebKit::WebURLLoader;
 using WebKit::WebVector;
+using WebKit::WebViewImpl;
 using WebKit::WebWidgetClient;
 using WebKit::WebWorkerClientImpl;
 
 namespace {
 
 ChromeClientImpl* ToChromeClient(WebCore::Widget* widget) {
   WebCore::FrameView* view;
   if (widget->isFrameView()) {
     view = static_cast<WebCore::FrameView*>(widget);
   } else if (widget->parent() && widget->parent()->isFrameView()) {
@@ skipping 340 matching lines @@
 }
 
 //--------------------------------------------------------------------------
 
 // These are temporary methods that the WebKit layer can use to call to the
 // Glue layer.  Once the Glue layer moves entirely into the WebKit layer, these
 // methods will be deleted.
 
 WebKit::WebMediaPlayer* WebKitClientImpl::createWebMediaPlayer(
   WebKit::WebMediaPlayerClient* client, WebCore::Frame* frame) {
-  WebFrameImpl* webframe = WebFrameImpl::FromFrame(frame);
+  WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);
   if (!webframe->client())
     return NULL;
 
   return webframe->client()->createMediaPlayer(webframe, client);
 }
 
 void WebKitClientImpl::setCursorForPlugin(
     const WebKit::WebCursorInfo& cursor_info, WebCore::Frame* frame) {
   WebCore::Page* page = frame->page();
   if (!page)
       return;
 
   ChromeClientImpl* chrome_client =
       static_cast<ChromeClientImpl*>(page->chrome()->client());
 
   // A windowless plugin can change the cursor in response to the WM_MOUSEMOVE
   // event. We need to reflect the changed cursor in the frame view as the
   // mouse is moved in the boundaries of the windowless plugin.
   chrome_client->setCursorForPlugin(cursor_info);
 }
 
 void WebKitClientImpl::notifyJSOutOfMemory(WebCore::Frame* frame) {
   if (!frame)
     return;
 
-  WebFrameImpl* webframe = WebFrameImpl::FromFrame(frame);
+  WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);
   if (!webframe->client())
     return;
   webframe->client()->didExhaustMemoryAvailableForScript(webframe);
 }
 
 bool WebKitClientImpl::popupsAllowed(NPP npp) {
   bool popups_allowed = false;
   if (npp) {
     NPAPI::PluginInstance* plugin_instance =
         reinterpret_cast<NPAPI::PluginInstance*>(npp->ndata);
@@ skipping 84 matching lines @@
   return file_util::DirectoryExists(file_path);
 }
 
 WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) {
   FilePath file_path(webkit_glue::WebStringToFilePathString(path));
   GURL file_url = net::FilePathToFileURL(file_path);
   return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url));
 }
 
 }  // namespace webkit_glue