diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-28 01:13:47 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-28 01:13:47 +0000 |
| commit | 90a3fbb1723ba60bcf557121b7bbe80817a7533f (patch) | |
| tree | 28d845ed0f1d64cdfa418f4561af4536de6f3c40 /webkit/glue/editor_client_impl.cc | |
| parent | 41fb1d7d262e44d8561a5c4d6d7e353f638b56e8 (diff) | |
| download | chromium_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/editor_client_impl.cc')
| -rw-r--r-- | webkit/glue/editor_client_impl.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc index f7fc4e4..7e60c4e 100644 --- a/webkit/glue/editor_client_impl.cc +++ b/webkit/glue/editor_client_impl.cc @@ -25,6 +25,8 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "PlatformString.h" MSVC_POP_WARNING(); +#include "WebKit.h" + #undef LOG #include "base/message_loop.h" #include "base/string_util.h" @@ -92,7 +94,7 @@ bool EditorClientImpl::shouldShowDeleteInterface(WebCore::HTMLElement* elem) { // Normally, we don't care to show WebCore's deletion UI, so we only enable // it if in testing mode and the test specifically requests it by using this // magic class name. - return webkit_glue::IsLayoutTestMode() && + return WebKit::layoutTestMode() && elem->className() == "needsDeletionUI"; } @@ -493,9 +495,9 @@ static const KeyDownEntry keyDownEntries[] = { { WebCore::VKEY_RETURN, AltKey, "InsertNewline" }, { WebCore::VKEY_RETURN, AltKey | ShiftKey, "InsertNewline" }, { WebCore::VKEY_RETURN, ShiftKey, "InsertLineBreak" }, - { WebCore::VKEY_INSERT, CtrlKey, "Copy" }, - { WebCore::VKEY_INSERT, ShiftKey, "Paste" }, - { WebCore::VKEY_DELETE, ShiftKey, "Cut" }, + { WebCore::VKEY_INSERT, CtrlKey, "Copy" }, + { WebCore::VKEY_INSERT, ShiftKey, "Paste" }, + { WebCore::VKEY_DELETE, ShiftKey, "Cut" }, #if defined(OS_MACOSX) { 'C', CommandKey, "Copy" }, { 'V', CommandKey, "Paste" }, |