Flesh out more of ChromiumBridge.cpp eliminating all but two methods on...

webkit/api/src/FrameLoaderClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
 #include "HitTestResult.h"
 #include "MIMETypeRegistry.h"
 #include "MouseEvent.h"
 #include "Page.h"
 #include "PlatformString.h"
 #include "PluginData.h"
 #include "StringExtras.h"
 #include "WebForm.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
+#include "WebKit.h"
+#include "WebKitClient.h"
 #include "WebNode.h"
 #include "WebPlugin.h"
 #include "WebPluginParams.h"
 #include "WebSecurityOrigin.h"
 #include "WebURL.h"
 #include "WebURLError.h"
 #include "WebVector.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "WebDataSourceImpl.h"
 #include "WebPluginContainerImpl.h"
 #include "WebPluginLoadObserver.h"
 #include "WindowFeatures.h"
 #include "WrappedResourceRequest.h"
 #include "WrappedResourceResponse.h"
 
 // FIXME: remove these
-#include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
-#include "webkit/glue/webkit_glue.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 // Domain for internal error codes.
 static const char internalErrorDomain[] = "WebKit";
 
 // An internal error code.  Used to note a policy change error resulting from
 // dispatchDecidePolicyForMIMEType not passing the PolicyUse option.
@@ skipping 1114 matching lines @@
     return ds.release();
 }
 
 void FrameLoaderClientImpl::setTitle(const String& title, const KURL& url)
 {
     // FIXME: inform consumer of changes to the title.
 }
 
 String FrameLoaderClientImpl::userAgent(const KURL& url)
 {
-    // FIXME: Convert this to a WebKitClient callback.
-    return webkit_glue::StdStringToString(
-        webkit_glue::GetUserAgent(webkit_glue::KURLToGURL(url)));
+    return webKitClient()->userAgent(url);
 }
 
 void FrameLoaderClientImpl::savePlatformDataToCachedFrame(CachedFrame*)
 {
     // The page cache should be disabled.
     ASSERT_NOT_REACHED();
 }
 
 void FrameLoaderClientImpl::transitionToCommittedFromCachedFrame(CachedFrame*)
 {
@@ skipping 173 matching lines @@
 }
 
 PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver()
 {
     WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader(
         m_webFrame->frame()->loader()->activeDocumentLoader());
     return ds->releasePluginLoadObserver();
 }
 
 } // namespace WebKit