[Linux] Always enable emacs key bindings.

BUG=37852 C-u views source in password entries
TEST=See bug report.

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

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

4 files changed, 2 insertions, 16 deletions

diff --git a/chrome/browser/renderer_host/gtk_key_bindings_handler.cc b/chrome/browser/renderer_host/gtk_key_bindings_handler.cc
index 162b352..c3c9ad4 100644
--- a/chrome/browser/renderer_host/gtk_key_bindings_handler.cc
+++ b/chrome/browser/renderer_host/gtk_key_bindings_handler.cc
@@ -14,8 +14,7 @@
 
 GtkKeyBindingsHandler::GtkKeyBindingsHandler(GtkWidget* parent_widget)
     : handler_(CreateNewHandler()),
-      edit_commands_(NULL),
-      enabled_(false) {
+      edit_commands_(NULL) {
   DCHECK(GTK_IS_FIXED(parent_widget));
   // We need add the |handler_| object into gtk widget hierarchy, so that
   // gtk_bindings_activate_event() can find correct display and keymaps from
@@ -29,7 +28,7 @@ GtkKeyBindingsHandler::~GtkKeyBindingsHandler() {
 
 bool GtkKeyBindingsHandler::Match(const NativeWebKeyboardEvent& wke,
                                   EditCommands* edit_commands) {
-  if (!enabled_ || wke.type == WebKit::WebInputEvent::Char || !wke.os_event)
+  if (wke.type == WebKit::WebInputEvent::Char || !wke.os_event)
     return false;
 
   edit_commands_.clear();
diff --git a/chrome/browser/renderer_host/gtk_key_bindings_handler.h b/chrome/browser/renderer_host/gtk_key_bindings_handler.h
index 48047c8..2a42e1b 100644
--- a/chrome/browser/renderer_host/gtk_key_bindings_handler.h
+++ b/chrome/browser/renderer_host/gtk_key_bindings_handler.h
@@ -38,11 +38,6 @@ class GtkKeyBindingsHandler {
   explicit GtkKeyBindingsHandler(GtkWidget* parent_widget);
   ~GtkKeyBindingsHandler();
 
-  // Key bindings handler will be disabled when IME is disabled by webkit.
-  void set_enabled(bool enabled) {
-    enabled_ = enabled;
-  }
-
   // Matches a key event against predefined gtk key bindings, false will be
   // returned if the key event doesn't correspond to a predefined key binding.
   // Edit commands matched with |wke| will be stored in |edit_commands|.
@@ -127,10 +122,6 @@ class GtkKeyBindingsHandler {
 
   // Buffer to store the match results.
   EditCommands edit_commands_;
-
-  // Indicates if key bindings handler is enabled or not.
-  // It'll only be enabled if IME is enabled by webkit.
-  bool enabled_;
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_GTK_KEY_BINDINGS_HANDLER_H_
diff --git a/chrome/browser/renderer_host/gtk_key_bindings_handler_unittest.cc b/chrome/browser/renderer_host/gtk_key_bindings_handler_unittest.cc
index 0f26e1a..19f0806 100644
--- a/chrome/browser/renderer_host/gtk_key_bindings_handler_unittest.cc
+++ b/chrome/browser/renderer_host/gtk_key_bindings_handler_unittest.cc
@@ -72,9 +72,6 @@ class GtkKeyBindingsHandlerTest : public testing::Test {
                       const EditCommand expected_result[],
                       size_t size) {
     EditCommands result;
-    handler_->set_enabled(false);
-    ASSERT_FALSE(handler_->Match(event, &result));
-    handler_->set_enabled(true);
     ASSERT_TRUE(handler_->Match(event, &result));
     ASSERT_EQ(size, result.size());
     for (size_t i = 0; i < size; ++i) {
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index e6c476e9..7b02f6a 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -526,7 +526,6 @@ void RenderWidgetHostViewGtk::SetIsLoading(bool is_loading) {
 void RenderWidgetHostViewGtk::IMEUpdateStatus(int control,
                                               const gfx::Rect& caret_rect) {
   im_context_->UpdateStatus(control, caret_rect);
-  key_bindings_handler_->set_enabled(control != IME_DISABLE);
 }
 
 void RenderWidgetHostViewGtk::DidPaintBackingStoreRects(