summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_webview_delegate.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/tools/test_shell/test_webview_delegate.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/tools/test_shell/test_webview_delegate.cc')
-rwxr-xr-xwebkit/tools/test_shell/test_webview_delegate.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 77dad42..9097dbd 100755
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -8,6 +8,8 @@
#include "webkit/tools/test_shell/test_webview_delegate.h"
+#include "WebKit.h"
+
#include "base/file_util.h"
#include "base/gfx/point.h"
#include "base/gfx/native_widget_types.h"
@@ -444,7 +446,7 @@ bool TestWebViewDelegate::RunJavaScriptPrompt(WebView* webview,
void TestWebViewDelegate::SetStatusbarText(WebView* webview,
const std::wstring& message) {
- if (webkit_glue::IsLayoutTestMode() &&
+ if (WebKit::layoutTestMode() &&
shell_->layout_test_controller()->ShouldDumpStatusCallbacks()) {
// When running tests, write to stdout.
printf("UI DELEGATE STATUS CALLBACK: setStatusText:%S\n", message.c_str());
@@ -453,7 +455,7 @@ void TestWebViewDelegate::SetStatusbarText(WebView* webview,
void TestWebViewDelegate::StartDragging(WebView* webview,
const WebDropData& drop_data) {
- if (webkit_glue::IsLayoutTestMode()) {
+ if (WebKit::layoutTestMode()) {
WebDropData mutable_drop_data = drop_data;
if (shell_->layout_test_controller()->ShouldAddFileToPasteboard()) {
// Add a file called DRTFakeFile to the drag&drop clipboard.