Second attempt at adding setSmartInsertDeleteEnabled and

setSelectTrailingWhitespaceEnabled.

Now we allow both to be true because that's what we do on Windows.

Review URL: http://codereview.chromium.org/13213

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6761 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 19 insertions, 1 deletions

diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 061cc9b..19354f6 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -548,7 +548,25 @@ bool TestWebViewDelegate::ShouldApplyStyle(WebView* webview,
 }
 
 bool TestWebViewDelegate::SmartInsertDeleteEnabled() {
-  return true;
+  return smart_insert_delete_enabled_;
+}
+
+void TestWebViewDelegate::SetSmartInsertDeleteEnabled(bool enabled) {
+  smart_insert_delete_enabled_ = enabled;
+  // In upstream WebKit, smart insert/delete is mutually exclusive with select
+  // trailing whitespace, however, we allow both because Chromium on Windows
+  // allows both.
+}
+
+bool TestWebViewDelegate::IsSelectTrailingWhitespaceEnabled() {
+  return select_trailing_whitespace_enabled_;
+}
+
+void TestWebViewDelegate::SetSelectTrailingWhitespaceEnabled(bool enabled) {
+  select_trailing_whitespace_enabled_ = enabled;
+  // In upstream WebKit, smart insert/delete is mutually exclusive with select
+  // trailing whitespace, however, we allow both because Chromium on Windows
+  // allows both.
 }
 
 void TestWebViewDelegate::DidBeginEditing() {