[Linux Views] Refactor accelerator handler related code.

views/focus/focus_manager_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "app/combobox_model.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 1467 matching lines @@
   }
 
  private:
   bool accelerator_pressed_;
   std::vector<base::KeyboardCode> keys_pressed_;
   std::vector<base::KeyboardCode> keys_released_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageTrackingView);
 };
 
+#if defined(OS_WIN)
+// This test is now Windows only. Linux Views port does not handle accelerator
+// keys in AcceleratorHandler anymore. The logic has been moved into
+// WidgetGtk::OnKeyEvent().
 // Tests that the keyup messages are eaten for accelerators.
 TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) {
   FocusManager* focus_manager = GetFocusManager();
   MessageTrackingView* mtv = new MessageTrackingView();
   mtv->AddAccelerator(Accelerator(base::VKEY_0, false, false, false));
   mtv->AddAccelerator(Accelerator(base::VKEY_1, false, false, false));
   content_view_->AddChildView(mtv);
   focus_manager->SetFocusedView(mtv);
 
   // First send a non-accelerator key sequence.
@@ skipping 48 matching lines @@
   // Same thing with repeat and more than one key at once.
   PostKeyDown(base::VKEY_0);
   PostKeyDown(base::VKEY_1);
   PostKeyDown(base::VKEY_1);
   PostKeyDown(base::VKEY_0);
   PostKeyDown(base::VKEY_0);
   PostKeyUp(base::VKEY_1);
   PostKeyUp(base::VKEY_0);
   MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
   MessageLoopForUI::current()->Run(&accelerator_handler);
-#if defined(OS_WIN)
-  // Linux eats only last accelerator's release event.
-  // See http://crbug.com/23383 for details.
   EXPECT_TRUE(mtv->keys_pressed().empty());
   EXPECT_TRUE(mtv->keys_released().empty());
-#endif
   EXPECT_TRUE(mtv->accelerator_pressed());
   mtv->Reset();
 }
+#endif
 
 #if defined(OS_WIN)
 // Test that the focus manager is created successfully for the first view
 // window parented to a native dialog.
 TEST_F(FocusManagerTest, CreationForNativeRoot) {
   // Create a window class.
   WNDCLASSEX class_ex;
   memset(&class_ex, 0, sizeof(class_ex));
   class_ex.cbSize = sizeof(WNDCLASSEX);
   class_ex.lpfnWndProc = &DefWindowProc;
@@ skipping 142 matching lines @@
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 
   // Clear window_ so that we don't try to close it again.
   window_ = NULL;
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace views