| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // The Mac interface forwards most of these commands to the application layer, | 5 // The Mac interface forwards most of these commands to the application layer, |
| 6 // and I'm not really sure what to do about most of them. | 6 // and I'm not really sure what to do about most of them. |
| 7 | 7 |
| 8 #include "config.h" | 8 #include "config.h" |
| 9 | 9 |
| 10 #include "Document.h" | 10 #include "Document.h" |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 { WebCore::VKEY_TAB, ShiftKey, "InsertBacktab" }, | 451 { WebCore::VKEY_TAB, ShiftKey, "InsertBacktab" }, |
| 452 { WebCore::VKEY_RETURN, 0, "InsertNewline" }, | 452 { WebCore::VKEY_RETURN, 0, "InsertNewline" }, |
| 453 { WebCore::VKEY_RETURN, CtrlKey, "InsertNewline" }, | 453 { WebCore::VKEY_RETURN, CtrlKey, "InsertNewline" }, |
| 454 { WebCore::VKEY_RETURN, AltKey, "InsertNewline" }, | 454 { WebCore::VKEY_RETURN, AltKey, "InsertNewline" }, |
| 455 { WebCore::VKEY_RETURN, AltKey | ShiftKey, "InsertNewline" }, | 455 { WebCore::VKEY_RETURN, AltKey | ShiftKey, "InsertNewline" }, |
| 456 { WebCore::VKEY_RETURN, ShiftKey, "InsertLineBreak" }, | 456 { WebCore::VKEY_RETURN, ShiftKey, "InsertLineBreak" }, |
| 457 { WebCore::VKEY_INSERT, CtrlKey, "Copy" }, | 457 { WebCore::VKEY_INSERT, CtrlKey, "Copy" }, |
| 458 { WebCore::VKEY_INSERT, ShiftKey, "Paste" }, | 458 { WebCore::VKEY_INSERT, ShiftKey, "Paste" }, |
| 459 { WebCore::VKEY_DELETE, ShiftKey, "Cut" }, | 459 { WebCore::VKEY_DELETE, ShiftKey, "Cut" }, |
| 460 #if PLATFORM(DARWIN) | 460 #if PLATFORM(DARWIN) |
| 461 { 'C', CommandKey, "Copy" }, | 461 // TODO(thakis): Remove -- crbug.com/25205 |
| 462 { 'V', CommandKey, "Paste" }, | |
| 463 { 'V', CommandKey | ShiftKey, | 462 { 'V', CommandKey | ShiftKey, |
| 464 "PasteAndMatchStyle" }, | 463 "PasteAndMatchStyle" }, |
| 465 { 'X', CommandKey, "Cut" }, | 464 |
| 466 { 'A', CommandKey, "SelectAll" }, | 465 // TODO(port): Remove once undo and redo are hooked up correctly in the menu |
| 466 // and are validated correctly. |
| 467 { 'Z', CommandKey, "Undo" }, | 467 { 'Z', CommandKey, "Undo" }, |
| 468 { 'Z', CommandKey | ShiftKey, | 468 { 'Z', CommandKey | ShiftKey, |
| 469 "Redo" }, | 469 "Redo" }, |
| 470 { 'Y', CommandKey, "Redo" }, | |
| 471 #else | 470 #else |
| 472 { 'C', CtrlKey, "Copy" }, | 471 { 'C', CtrlKey, "Copy" }, |
| 473 { 'V', CtrlKey, "Paste" }, | 472 { 'V', CtrlKey, "Paste" }, |
| 474 { 'V', CtrlKey | ShiftKey, "PasteAndMatchStyle" }, | 473 { 'V', CtrlKey | ShiftKey, "PasteAndMatchStyle" }, |
| 475 { 'X', CtrlKey, "Cut" }, | 474 { 'X', CtrlKey, "Cut" }, |
| 476 { 'A', CtrlKey, "SelectAll" }, | 475 { 'A', CtrlKey, "SelectAll" }, |
| 477 { 'Z', CtrlKey, "Undo" }, | 476 { 'Z', CtrlKey, "Undo" }, |
| 478 { 'Z', CtrlKey | ShiftKey, "Redo" }, | 477 { 'Z', CtrlKey | ShiftKey, "Redo" }, |
| 479 { 'Y', CtrlKey, "Redo" }, | 478 { 'Y', CtrlKey, "Redo" }, |
| 480 #endif | 479 #endif |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 901 | 900 |
| 902 void EditorClientImpl::getGuessesForWord(const WebCore::String&, | 901 void EditorClientImpl::getGuessesForWord(const WebCore::String&, |
| 903 WTF::Vector<WebCore::String>& guesses) { | 902 WTF::Vector<WebCore::String>& guesses) { |
| 904 notImplemented(); | 903 notImplemented(); |
| 905 } | 904 } |
| 906 | 905 |
| 907 void EditorClientImpl::setInputMethodState(bool enabled) { | 906 void EditorClientImpl::setInputMethodState(bool enabled) { |
| 908 if (webview_->client()) | 907 if (webview_->client()) |
| 909 webview_->client()->setInputMethodEnabled(enabled); | 908 webview_->client()->setInputMethodEnabled(enabled); |
| 910 } | 909 } |
| OLD | NEW |