revert commit 6607.

tbr=ojan

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

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

3 files changed, 10 insertions, 10 deletions

diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc
index 7fe4a52..abf2ecf 100644
--- a/webkit/glue/editor_client_impl.cc
+++ b/webkit/glue/editor_client_impl.cc
@@ -603,6 +603,7 @@ void EditorClientImpl::handleKeyboardEvent(WebCore::KeyboardEvent* evt) {
 }
 
 void EditorClientImpl::handleInputMethodKeydown(WebCore::KeyboardEvent* keyEvent) {
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::textFieldDidBeginEditing(WebCore::Element*) {
diff --git a/webkit/glue/event_conversion.cc b/webkit/glue/event_conversion.cc
index 881cdae..5de8271 100644
--- a/webkit/glue/event_conversion.cc
+++ b/webkit/glue/event_conversion.cc
@@ -283,8 +283,10 @@ MakePlatformKeyboardEvent::MakePlatformKeyboardEvent(const WebKeyboardEvent& e)
         m_text = "\x9";
         m_unmodifiedText = "\x9";
     }
-#elif defined(OS_WIN) || defined(OS_LINUX)
+#elif defined(OS_WIN)
     m_text = m_unmodifiedText = ToSingleCharacterString(e.key_code);
+#elif defined(OS_LINUX)
+    m_text = m_unmodifiedText = ToSingleCharacterString(e.text);
 #endif
   }
 #if defined(OS_WIN) || defined(OS_LINUX)
@@ -305,13 +307,10 @@ MakePlatformKeyboardEvent::MakePlatformKeyboardEvent(const WebKeyboardEvent& e)
   m_metaKey = (e.modifiers & WebInputEvent::META_KEY) != 0;
 #if defined(OS_WIN)
   m_isSystemKey = e.system_key;
-// TODO(port): set this field properly for linux and mac.
-#elif defined(OS_LINUX)
-  m_isSystemKey = m_altKey;
 #else
-  m_isSystemKey = false;
+  m_isSystemKey = false;  // TODO(port): make this proper.
 #endif
-}
+} 
 
 void MakePlatformKeyboardEvent::SetKeyType(Type type) {
   // According to the behavior of Webkit in Windows platform,
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index c07825c..67285ff 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -513,12 +513,12 @@ bool WebViewImpl::CharEvent(const WebKeyboardEvent& event) {
   if (!evt.IsCharacterKey())
     return true;
 
-  // Safari 3.1 does not pass off windows system key messages (WM_SYSCHAR) to
-  // the eventHandler::keyEvent. We mimic this behavior on all platforms since
-  // for now we are converting other platform's key events to windows key
-  // events.
+#if defined(OS_WIN)
+  // Safari 3.1 does not pass off WM_SYSCHAR messages to the
+  // eventHandler::keyEvent. We mimic this behavior.
   if (evt.isSystemKey())
     return handler->handleAccessKey(evt);
+#endif
 
   if (!handler->keyEvent(evt))
     return KeyEventDefault(event);