summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webplugin_impl.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-28 01:13:47 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-28 01:13:47 +0000
commit90a3fbb1723ba60bcf557121b7bbe80817a7533f (patch)
tree28d845ed0f1d64cdfa418f4561af4536de6f3c40 /webkit/glue/webplugin_impl.cc
parent41fb1d7d262e44d8561a5c4d6d7e353f638b56e8 (diff)
downloadchromium_src-90a3fbb1723ba60bcf557121b7bbe80817a7533f.zip
chromium_src-90a3fbb1723ba60bcf557121b7bbe80817a7533f.tar.gz
chromium_src-90a3fbb1723ba60bcf557121b7bbe80817a7533f.tar.bz2
Chrome side to pick up new WebKit API changes.
WebKit API now provides: - layoutTestMode - support for registering extra local URL schemes - access to the current WebKitClient WebKitClient was extended to include: - access to the default locale - access to the current time - methods to start/stop the shared timer - method to get work scheduled on the main thread - methods to access cookies - method to prefetch hostnames R=dglazkov Review URL: http://codereview.chromium.org/27276 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webplugin_impl.cc')
-rw-r--r--webkit/glue/webplugin_impl.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index e128227..8449b89 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -41,6 +41,12 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "ScrollView.h"
#include "Widget.h"
MSVC_POP_WARNING();
+
+#include "WebKit.h"
+#include "WebKitClient.h"
+#include "WebString.h"
+#include "WebURL.h"
+
#undef LOG
#include "base/gfx/rect.h"
@@ -541,11 +547,11 @@ NPObject* WebPluginImpl::GetPluginElement() {
void WebPluginImpl::SetCookie(const GURL& url,
const GURL& policy_url,
const std::string& cookie) {
- webkit_glue::SetCookie(url, policy_url, cookie);
+ WebKit::webKitClient()->setCookies(url, policy_url, UTF8ToUTF16(cookie));
}
std::string WebPluginImpl::GetCookies(const GURL& url, const GURL& policy_url) {
- return webkit_glue::GetCookies(url, policy_url);
+ return UTF16ToUTF8(WebKit::webKitClient()->cookies(url, policy_url));
}
void WebPluginImpl::ShowModalHTMLDialog(const GURL& url, int width, int height,